Clean up

6 files changed, 5 insertions, 45 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index 64ccd910120..ad785a33d5b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -123,7 +123,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                 wantedNodeVespaVersion);
         MetricUpdater applicationMetricUpdater = metrics.getOrCreateMetricUpdater(Metrics.createDimensions(applicationId));
         ServerCache serverCache = new ServerCache(configDefinitionRepo, zkClient.getUserConfigDefinitions());
-        return new Application(withDeferredConfigForRestartingClusters(modelFactory.createModel(modelContext)),
+        return new Application(modelFactory.createModel(modelContext),
                                serverCache,
                                applicationGeneration,
                                modelFactory.version(),
@@ -170,15 +170,4 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                                                zkClient.readDataplaneTokens());
     }
 
-    private Model withDeferredConfigForRestartingClusters(Model model) {
-        if ( ! (model instanceof VespaModel vespaModel)) return model;
-        for (ClusterSpec.Id cluster : zkClient.readActivationTriggers().restartingClusters()) {
-            ApplicationContainerCluster containerCluster = vespaModel.getContainerClusters().get(cluster.value());
-            if (containerCluster != null) containerCluster.setDeferChangesUntilRestart(true);
-            ContentCluster contentCluster = vespaModel.getContentClusters().get(cluster.value());
-            if (contentCluster != null) contentCluster.setDeferChangesUntilRestart(true);
-        }
-        return model;
-    }
-
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggers.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggers.java
index 04db4b1b806..e704a36d21e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggers.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggers.java
@@ -15,9 +15,9 @@ import java.util.List;
  *
  * @author jonmv
  */
-public record ActivationTriggers(List<NodeRestart> nodeRestarts, List<ClusterSpec.Id> restartingClusters, List<Reindexing> reindexings) {
+public record ActivationTriggers(List<NodeRestart> nodeRestarts, List<Reindexing> reindexings) {
 
-    private static final ActivationTriggers empty = new ActivationTriggers(List.of(), List.of(), List.of());
+    private static final ActivationTriggers empty = new ActivationTriggers(List.of(), List.of());
 
     public record NodeRestart(String hostname) { }
     public record Reindexing(String clusterId, String documentType) { }
@@ -30,11 +30,6 @@ public record ActivationTriggers(List<NodeRestart> nodeRestarts, List<ClusterSpe
                                                          .hostnames().stream()
                                                          .map(NodeRestart::new)
                                                          .toList(),
-                                      configChangeActions.getRestartActions()
-                                                         .useForInternalRestart(isInternalRedeployment)
-                                                         .getEntries().stream()
-                                                         .map(entry -> ClusterSpec.Id.from(entry.getClusterName()))
-                                                         .toList(),
                                       configChangeActions.getReindexActions().getEntries().stream()
                                                          .map(entry -> new Reindexing(entry.getClusterName(), entry.getDocumentType()))
                                                          .toList());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializer.java
index 11a0f3cb935..4bad32ffee4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializer.java
@@ -17,7 +17,6 @@ import static com.yahoo.yolean.Exceptions.uncheck;
 public class ActivationTriggersSerializer {
 
     static final String NODE_RESTARTS = "nodeRestarts";
-    static final String RESTARTING_CLUSTERS = "restartingClusters";
     static final String REINDEXINGS = "reindexings";
     static final String CLUSTER_NAME = "clusterName";
     static final String DOCUMENT_TYPE = "documentType";
@@ -37,10 +36,6 @@ public class ActivationTriggersSerializer {
         for (NodeRestart nodeRestart : triggers.nodeRestarts())
             nodeRestarts.addString(nodeRestart.hostname());
 
-        Cursor restartingClusters = object.setArray(RESTARTING_CLUSTERS);
-        for (ClusterSpec.Id clusterId : triggers.restartingClusters())
-            restartingClusters.addString(clusterId.value());
-
         Cursor reindexings = object.setArray(REINDEXINGS);
         for (Reindexing reindexing : triggers.reindexings()) {
             Cursor entry = reindexings.addObject();
@@ -56,14 +51,11 @@ public class ActivationTriggersSerializer {
         List<NodeRestart> nodeRestarts = SlimeUtils.entriesStream(object.field(NODE_RESTARTS))
                                                    .map(entry -> new NodeRestart(entry.asString()))
                                                    .toList();
-        List<ClusterSpec.Id> restartingClusters = SlimeUtils.entriesStream(object.field(RESTARTING_CLUSTERS))
-                                                            .map(entry -> ClusterSpec.Id.from(entry.asString()))
-                                                            .toList();
         List<Reindexing> reindexings = SlimeUtils.entriesStream(object.field(REINDEXINGS))
                                                    .map(entry -> new Reindexing(entry.field(CLUSTER_NAME).asString(),
                                                                                 entry.field(DOCUMENT_TYPE).asString()))
                                                    .toList();
-        return new ActivationTriggers(nodeRestarts, restartingClusters, reindexings);
+        return new ActivationTriggers(nodeRestarts, reindexings);
     }
 
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
index a6f2eb38cc3..838b1b6b209 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
@@ -537,20 +537,6 @@ public class HostedDeployTest {
         assertEquals(Optional.of(ApplicationReindexing.empty()
                                                       .withPending("music", "music", prepareResult.sessionId())),
                      tester.tenant().getApplicationRepo().database().readReindexingStatus(tester.applicationId()));
-
-        VespaModel model = ((VespaModel) tester.tenant().getSessionRepository()
-                                               .activeApplicationVersions(tester.applicationId()).get().get(Version.fromString("6.1.0")).get()
-                                               .getModel());
-
-        // Config for the container cluster to be restarted has been deferred until after restart.
-        ComponentsConfig.Builder builder1 = new ComponentsConfig.Builder();
-        model.getContainerClusters().get("container").getContainers().get(0).getConfig(builder1);
-        assertTrue(builder1.getApplyOnRestart());
-
-        // Config for the metricsproxy cluster, which is not restarted, has not been deferred until after restart.
-        ComponentsConfig.Builder builder2 = new ComponentsConfig.Builder();
-        model.getAdmin().getMetricsProxyCluster().getContainers().get(0).getConfig(builder2);
-        assertFalse(builder2.getApplyOnRestart());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java
index 085fecaea16..5ef143198e8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java
@@ -1,6 +1,5 @@
 package com.yahoo.vespa.config.server.session;
 
-import com.yahoo.config.provision.ClusterSpec.Id;
 import com.yahoo.vespa.config.server.session.ActivationTriggers.NodeRestart;
 import com.yahoo.vespa.config.server.session.ActivationTriggers.Reindexing;
 import org.junit.jupiter.api.Test;
@@ -18,7 +17,6 @@ class ActivationTriggersSerializerTest {
     void testSerialization() {
         ActivationTriggers triggers = new ActivationTriggers(List.of(new NodeRestart("node1"),
                                                                      new NodeRestart("node2")),
-                                                             List.of(Id.from("cluster1")),
                                                              List.of(new Reindexing("cluster1", "type1"),
                                                                      new Reindexing("cluster1", "type2"),
                                                                      new Reindexing("cluster2", "type1")));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
index e182c3f557b..2fe46868562 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
@@ -178,7 +178,7 @@ public class SessionZooKeeperClientTest {
         String data = Utf8.toString(curator.getData(path).get());
         assertTrue(data.contains("{\"applicationId\":\"default:default:default\",\"applicationPackageReference\":\"foo\",\"version\":\"8.195.1\",\"createTime\":"));
         assertTrue(data.contains(",\"tenantSecretStores\":[],\"operatorCertificates\":[],\"dataplaneTokens\":[]," +
-                                 "\"activationTriggers\":{\"nodeRestarts\":[],\"restartingClusters\":[],\"reindexings\":[]}"));
+                                 "\"activationTriggers\":{\"nodeRestarts\":[],\"reindexings\":[]}"));
     }
 
     private void assertApplicationIdParse(long sessionId, String idString, String expectedIdString) {