Merge pull request #26662 from vespa-engine/jonmv/restart-container-when-content-cluster-is-removed

Restart all application container clusters when content clusters are …

2 files changed, 28 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java
index 0cc52edf3cc..b1eace947cc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java
@@ -2,11 +2,15 @@
 package com.yahoo.vespa.model.application.validation.change;
 
 import com.yahoo.config.model.api.ConfigChangeAction;
+import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.config.application.api.ValidationId;
+import com.yahoo.vespa.model.container.ApplicationContainer;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -19,16 +23,23 @@ public class ContentClusterRemovalValidator implements ChangeValidator {
 
     @Override
     public List<ConfigChangeAction> validate(VespaModel current, VespaModel next, DeployState deployState) {
+        List<ConfigChangeAction> actions = new ArrayList<>();
         for (String currentClusterId : current.getContentClusters().keySet()) {
             ContentCluster nextCluster = next.getContentClusters().get(currentClusterId);
-            if (nextCluster == null)
+            if (nextCluster == null) {
                 deployState.validationOverrides().invalid(ValidationId.contentClusterRemoval,
-                                  "Content cluster '" + currentClusterId + "' is removed. " +
-                                  "This will cause loss of all data in this cluster",
-                                  deployState.now());
-        }
+                                                          "Content cluster '" + currentClusterId + "' is removed. " +
+                                                          "This will cause loss of all data in this cluster",
+                                                          deployState.now());
 
-        return List.of();
+                // If we allow the removal, we must restart all containers to ensure mbus is OK.
+                for (ApplicationContainerCluster cluster : next.getContainerClusters().values()) {
+                    actions.add(new VespaRestartAction(cluster.id(),
+                                                       "Content cluster '" + currentClusterId + "' has been removed",
+                                                       cluster.getContainers().stream().map(ApplicationContainer::getServiceInfo).toList()));
+                }
+            }
+        }
+        return actions;
     }
-
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidatorTest.java
index 5c360a9343f..65dfce8ff6c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidatorTest.java
@@ -1,14 +1,18 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.application.validation.change;
 
+import com.yahoo.collections.Pair;
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.application.api.ValidationOverrides;
+import com.yahoo.config.model.api.ConfigChangeAction;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.ValidationTester;
 import com.yahoo.yolean.Exceptions;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -36,7 +40,12 @@ public class ContentClusterRemovalValidatorTest {
     @Test
     void testOverridingContentRemovalValidation() {
         VespaModel previous = tester.deploy(null, getServices("contentClusterId"), Environment.prod, null).getFirst();
-        tester.deploy(previous, getServices("newContentClusterId"), Environment.prod, removalOverride); // Allowed due to override
+        var result = tester.deploy(previous, getServices("newContentClusterId"), Environment.prod, removalOverride); // Allowed due to override
+        assertEquals(result.getFirst().getContainerClusters().values().stream()
+                           .flatMap(cluster -> cluster.getContainers().stream())
+                           .map(container -> container.getServiceInfo())
+                           .toList(),
+                     result.getSecond().stream().flatMap(action -> action.getServices().stream()).toList());
     }
 
     private static String getServices(String contentClusterId) {