summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2022-01-17 09:33:31 +0100
committerJon Marius Venstad <venstad@gmail.com>2022-01-17 09:33:31 +0100
commitfd5a6d5401117b4351e0a4afd588dd4ca63046e5 (patch)
tree75e4bf27d5392dd01f41fc75ab19e575d8bad59e /config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
parent111335bbcb3b88e94952383e52ba53da592f43d0 (diff)
Revert "Revert "Jonmv/reapply zk changes 2""
This reverts commit 810da357155a349884b862de87e18de87ed54b35.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 89c455269f4..7f3f3a4cf77 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -309,8 +309,9 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
ZookeeperServerConfig.Server.Builder serverBuilder = new ZookeeperServerConfig.Server.Builder();
serverBuilder.hostname(container.getHostName())
.id(container.index())
- .joining(!previousHosts.isEmpty() &&
- !previousHosts.contains(container.getHostName()));
+ .joining( ! previousHosts.isEmpty() &&
+ ! previousHosts.contains(container.getHostName()))
+ .retired(container.isRetired());
builder.server(serverBuilder);
builder.dynamicReconfiguration(true);
}