summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2024-01-24 11:34:13 +0100
committerjonmv <venstad@gmail.com>2024-01-24 11:34:13 +0100
commit955fd3bcc9e31e55a5bc86496d865b471ebc6671 (patch)
tree5ed473f1610c4e5f080f07dbbfc96cbbe26d9b68
parente3db51d6c6d40be54495ed121c64be43978d1120 (diff)
configChangeActions is only set if prepare + activate on same Deployment
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 7c7608e5e5c..c219d59a44e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -177,7 +177,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
nodesToRestart.size(), nodesToRestart.stream().sorted().collect(joining(", "))));
log.info(String.format("%sWill schedule service restart of %d nodes after convergence on generation %d: %s",
session.logPre(), nodesToRestart.size(), session.getSessionId(), nodesToRestart.stream().sorted().collect(joining(", "))));
- this.configChangeActions = configChangeActions.withRestartActions(new RestartActions());
+ configChangeActions = configChangeActions == null ? null : configChangeActions.withRestartActions(new RestartActions());
}
private void storeReindexing(ApplicationId applicationId) {