From f3fe4e58bd8599cb54c5900b4482ad2527359ffc Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Wed, 12 Jan 2022 08:59:18 +0100
Subject: Revert "Revert "Jonmv/remove retired nodes from zk clusters when data
 migration complete [run-systemtest]""

This reverts commit 703a09ea682cb91b7df58f88efc48a0503fa3a4b.
---
 .../admin/clustercontroller/ClusterControllerCluster.java      |  6 ++----
 .../vespa/model/container/ApplicationContainerCluster.java     |  5 +++--
 .../yahoo/config/model/provision/ModelProvisioningTest.java    | 10 +++++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
index 6e6f027b520..f93ee3ce9c4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
@@ -50,14 +50,12 @@ public class ClusterControllerCluster extends AbstractConfigProducer<ClusterCont
     public void getConfig(ZookeeperServerConfig.Builder builder) {
         builder.clientPort(ZK_CLIENT_PORT);
         builder.juteMaxBuffer(1024 * 1024); // 1 Mb should be more than enough for cluster controller
-        boolean oldQuorumExists = containerCluster.getContainers().stream() // More than half the previous hosts must be present in the new config for quorum to persist.
-                                                  .filter(container -> previousHosts.contains(container.getHostName())) // Set intersection is symmetric.
-                                                  .count() > previousHosts.size() / 2;
         for (ClusterControllerContainer container : containerCluster.getContainers()) {
             ZookeeperServerConfig.Server.Builder serverBuilder = new ZookeeperServerConfig.Server.Builder();
             serverBuilder.hostname(container.getHostName());
             serverBuilder.id(container.index());
-            serverBuilder.joining(oldQuorumExists && ! previousHosts.contains(container.getHostName()));
+            serverBuilder.joining( ! previousHosts.contains(container.getHostName()));
+            serverBuilder.retired(container.isRetired());
             builder.server(serverBuilder);
         }
     }
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 c4d420f2d44..438e143bdfd 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);
         }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 10f883bdc75..ba70b7493a2 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -2054,7 +2054,7 @@ public class ModelProvisioningTest {
             assertTrue("Initial servers are not joining", config.build().server().stream().noneMatch(ZookeeperServerConfig.Server::joining));
         }
         {
-            VespaModel nextModel = tester.createModel(Zone.defaultZone(), servicesXml.apply(5), true, false, false, 0, Optional.of(model), new DeployState.Builder());
+            VespaModel nextModel = tester.createModel(Zone.defaultZone(), servicesXml.apply(3), true, false, false, 0, Optional.of(model), new DeployState.Builder(), "node-1-3-10-04", "node-1-3-10-03");
             ApplicationContainerCluster cluster = nextModel.getContainerClusters().get("zk");
             ZookeeperServerConfig.Builder config = new ZookeeperServerConfig.Builder();
             cluster.getContainers().forEach(c -> c.getConfig(config));
@@ -2067,6 +2067,14 @@ public class ModelProvisioningTest {
                                 4, true),
                          config.build().server().stream().collect(Collectors.toMap(ZookeeperServerConfig.Server::id,
                                                                                    ZookeeperServerConfig.Server::joining)));
+            assertEquals("Retired nodes are retired",
+                         Map.of(0, false,
+                                1, true,
+                                2, true,
+                                3, false,
+                                4, false),
+                         config.build().server().stream().collect(Collectors.toMap(ZookeeperServerConfig.Server::id,
+                                                                                   ZookeeperServerConfig.Server::retired)));
         }
     }
 
-- 
cgit v1.2.3


From 0a6bccac16c7e91baa8be4938bb3cd417a3aee9a Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Wed, 12 Jan 2022 08:59:44 +0100
Subject: New clusters have no joiners

---
 .../vespa/model/admin/clustercontroller/ClusterControllerCluster.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
index f93ee3ce9c4..0b99496a9b4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
@@ -54,7 +54,7 @@ public class ClusterControllerCluster extends AbstractConfigProducer<ClusterCont
             ZookeeperServerConfig.Server.Builder serverBuilder = new ZookeeperServerConfig.Server.Builder();
             serverBuilder.hostname(container.getHostName());
             serverBuilder.id(container.index());
-            serverBuilder.joining( ! previousHosts.contains(container.getHostName()));
+            serverBuilder.joining( ! previousHosts.isEmpty() && ! previousHosts.contains(container.getHostName()));
             serverBuilder.retired(container.isRetired());
             builder.server(serverBuilder);
         }
-- 
cgit v1.2.3