Also set up Curator in graph

3 files changed, 3 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index c85591336bb..307e0e17955 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -245,6 +245,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                                                MIN_ZOOKEEPER_NODE_COUNT + " and " + MAX_ZOOKEEPER_NODE_COUNT +
                                                ", have " + nonRetiredNodes + " non-retired");
         }
+        cluster.addSimpleComponent("com.yahoo.vespa.curator.Curator", null, "zkfacade");
         cluster.addSimpleComponent("com.yahoo.vespa.curator.CuratorWrapper", null, "zkfacade");
 
         // These need to be setup so that they will use the container's config id, since each container
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 3037d8a7cd9..cf6b6365792 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -569,6 +569,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
             VespaModel model = tester.createModel(servicesXml.apply(3), true);
             ApplicationContainerCluster cluster = model.getContainerClusters().get("default");
             assertNotNull(cluster);
+            assertComponentConfigured(cluster, "com.yahoo.vespa.curator.Curator");
             assertComponentConfigured(cluster, "com.yahoo.vespa.curator.CuratorWrapper");
             cluster.getContainers().forEach(container -> {
                 assertComponentConfigured(container, "com.yahoo.vespa.zookeeper.ReconfigurableVespaZooKeeperServer");
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
index 72f0fecb695..3799bf898ca 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
@@ -89,8 +89,7 @@ class SingletonManager implements AutoCloseable {
 
     @Override
     public synchronized void close() {
-        List<SingletonWorker> registered = List.copyOf(registrations.keySet());
-        for (SingletonWorker singleton : registered) {
+        for (SingletonWorker singleton : List.copyOf(registrations.keySet())) {
             String id = registrations.get(singleton);
             logger.log(Level.WARNING, singleton + " still registered with id '" + id + "' at shutdown");
             unregister(singleton);
@@ -151,7 +150,6 @@ class SingletonManager implements AutoCloseable {
             }
         }
 
-        @SuppressWarnings("fallthrough")
         private void run() {
             try {
                 while ( ! shutdown.get()) {