diff options
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggers.java')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/ActivationTriggers.java | 10 |
1 files changed, 8 insertions, 2 deletions
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 191f936c333..04db4b1b806 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 @@ -1,5 +1,6 @@ package com.yahoo.vespa.config.server.session; +import com.yahoo.config.provision.ClusterSpec; import com.yahoo.vespa.config.server.configchange.ConfigChangeActions; import java.util.List; @@ -14,9 +15,9 @@ import java.util.List; * * @author jonmv */ -public record ActivationTriggers(List<NodeRestart> nodeRestarts, List<Reindexing> reindexings) { +public record ActivationTriggers(List<NodeRestart> nodeRestarts, List<ClusterSpec.Id> restartingClusters, List<Reindexing> reindexings) { - private static final ActivationTriggers empty = new ActivationTriggers(List.of(), List.of()); + private static final ActivationTriggers empty = new ActivationTriggers(List.of(), List.of(), List.of()); public record NodeRestart(String hostname) { } public record Reindexing(String clusterId, String documentType) { } @@ -29,6 +30,11 @@ public record ActivationTriggers(List<NodeRestart> nodeRestarts, List<Reindexing .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()); |