Shut down shared Curator used by Reindexers

1 files changed, 6 insertions, 2 deletions

diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
index a37a24d2b01..4e263fb865d 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
@@ -50,6 +50,7 @@ public class ReindexingMaintainer extends AbstractComponent {
 
     private static final Logger log = Logger.getLogger(Reindexing.class.getName());
 
+    private final Curator curator;
     private final List<Reindexer> reindexers;
     private final ScheduledExecutorService executor;
 
@@ -65,11 +66,12 @@ public class ReindexingMaintainer extends AbstractComponent {
     ReindexingMaintainer(Clock clock, Metric metric, DocumentAccess access, ZookeepersConfig zookeepersConfig,
                          ClusterListConfig clusterListConfig, AllClustersBucketSpacesConfig allClustersBucketSpacesConfig,
                          ReindexingConfig reindexingConfig) {
+        this.curator = Curator.create(zookeepersConfig.zookeeperserverlist());
+        ReindexingCurator reindexingCurator = new ReindexingCurator(curator, access.getDocumentTypeManager());
         this.reindexers = reindexingConfig.clusters().entrySet().stream()
                                           .map(cluster -> new Reindexer(parseCluster(cluster.getKey(), clusterListConfig, allClustersBucketSpacesConfig, access.getDocumentTypeManager()),
                                                                         parseReady(cluster.getValue(), access.getDocumentTypeManager()),
-                                                                        new ReindexingCurator(Curator.create(zookeepersConfig.zookeeperserverlist()),
-                                                                                              access.getDocumentTypeManager()),
+                                                                        reindexingCurator,
                                                                         access,
                                                                         metric,
                                                                         clock))
@@ -111,6 +113,8 @@ public class ReindexingMaintainer extends AbstractComponent {
         }
         if ( ! executor.isShutdown())
             executor.shutdownNow();
+
+        curator.close();
     }
 
     static Map<DocumentType, Instant> parseReady(ReindexingConfig.Clusters cluster, DocumentTypeManager manager) {