diff options
Diffstat (limited to 'configserver')
2 files changed, 6 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java index 30681add11e..a8e1fa94920 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java @@ -17,7 +17,7 @@ import java.io.File; * @author Ulf Lilleengen */ @SuppressWarnings("WeakerAccess") -public class FileDistributionFactory { +public class FileDistributionFactory implements AutoCloseable { protected final ConfigserverConfig configserverConfig; private final Supervisor supervisor = new Supervisor(new Transport("filedistribution")); @@ -43,4 +43,8 @@ public class FileDistributionFactory { return new File(Defaults.getDefaults().underVespaHome(configserverConfig.fileReferencesDir())); } + public void close() { + supervisor.transport().shutdown().join(); + } + } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java index 7c6d1dea3a4..ef219a21221 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java @@ -533,6 +533,7 @@ public class TenantRepository { public void close() { directoryCache.close(); + fileDistributionFactory.close(); try { zkCacheExecutor.shutdown(); checkForRemovedApplicationsService.shutdown(); |