Log pool name when switching connection

3 files changed, 5 insertions, 5 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java
index 1dba56805a5..d32a866cfbd 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java
@@ -28,7 +28,7 @@ public class FileDistributionAndUrlDownload {
     public FileDistributionAndUrlDownload(Supervisor supervisor, ConfigSourceSet source) {
         fileDistributionRpcServer =
                 new FileDistributionRpcServer(supervisor,
-                                              new FileDownloader(new JRTConnectionPool(source, "filedistribution-jrt-pool-")));
+                                              new FileDownloader(new JRTConnectionPool(source, "filedistribution-jrt-pool")));
         urlDownloadRpcServer = new UrlDownloadRpcServer(supervisor);
         cleanupExecutor.scheduleAtFixedRate(new CachedFilesMaintainer(), delay.toSeconds(), delay.toSeconds(), TimeUnit.SECONDS);
     }
diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java
index b5147075972..78580328bf9 100644
--- a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java
+++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java
@@ -38,12 +38,12 @@ public class JRTConnectionPool implements ConnectionPool {
     private volatile JRTConnection currentConnection;
 
     public JRTConnectionPool(ConfigSourceSet sourceSet) {
-        this(sourceSet, "config-jrt-pool-" + sourceSet.hashCode());
+        this(sourceSet, "config-jrt-pool" + sourceSet.hashCode());
     }
 
     public JRTConnectionPool(ConfigSourceSet sourceSet, String poolName) {
         this.poolName = poolName;
-        supervisor = new Supervisor(new Transport(poolName)).setDropEmptyBuffers(true);
+        supervisor = new Supervisor(new Transport(poolName + "-")).setDropEmptyBuffers(true);
         addSources(sourceSet);
     }
 
@@ -91,7 +91,7 @@ public class JRTConnectionPool implements ConnectionPool {
         List<JRTConnection> sourceCandidates = getSources();
         sourceCandidates.remove(currentConnection);
         JRTConnection newConnection = pickNewConnectionRandomly(sourceCandidates);
-        log.log(Level.INFO, () -> "Switching from " + currentConnection + " to " + newConnection);
+        log.log(Level.INFO, () -> poolName + ": Switching from " + currentConnection + " to " + newConnection);
         return currentConnection = newConnection;
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java
index cfe7349a1c6..1985fd534fb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java
@@ -50,7 +50,7 @@ public class FileDistributionUtil {
                 .collect(Collectors.toList());
 
         return configServers.size() > 0
-                ? new JRTConnectionPool(new ConfigSourceSet(configServers), "filedistribution-jrt-pool-")
+                ? new JRTConnectionPool(new ConfigSourceSet(configServers), "filedistribution-jrt-pool")
                 : emptyConnectionPool();
     }