From 990a561813f0ff23e13c4571d00c2315c866497f Mon Sep 17 00:00:00 2001 From: jonmv Date: Fri, 7 Oct 2022 10:48:00 +0200 Subject: Move VespaCurator implementation to CuratorWrapper, with /user/ namespace --- .../java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-model/src/main/java/com') 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 5e09dd4732d..c85591336bb 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,7 +245,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { 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 // have different config (id of zookeeper server) -- cgit v1.2.3 From bad5d2aa8f8008ae59abc9381a6474d265ca60b7 Mon Sep 17 00:00:00 2001 From: jonmv Date: Mon, 10 Oct 2022 12:02:05 +0200 Subject: Also set up Curator in graph --- .../com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 1 + .../yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 1 + zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config-model/src/main/java/com') 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 { 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 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()) { -- cgit v1.2.3