Make sure to shutdown executor

2 files changed, 5 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index 3034c7dfd53..cb4945bdab3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -195,6 +195,10 @@ public class FileServer {
         return downloader;
     }
 
+    public void close() {
+        downloader.close();
+    }
+
     // Connection pool with all config servers except this one (might be an empty pool if there is only one config server)
     private static ConnectionPool createConnectionPool(ConfigserverConfig configserverConfig) {
         List<String> configServers = ConfigServerSpec.fromConfig(configserverConfig)
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 8ec0c71d7f2..851ad166c2d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -202,6 +202,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
             Thread.interrupted(); // Ignore and continue shutdown.
         }
         delayedConfigResponses.stop();
+        fileServer.close();
         supervisor.transport().shutdown().join();
         isRunning = false;
     }