diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-06-01 17:23:04 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-06-01 17:23:04 +0200 |
| commit | 7a0e67777977d31fd0235d268c294b6bd43f1b44 (patch) | |
| tree | a9a384ab78d8fa52ddb9fbebfbe4caef5ff23562 | |
| parent | 95a1d82254a7f05b71cb4ff2ace40958bfbe0212 (diff) | |
Move into method that does reconfiguration
2 files changed, 1 insertions, 1 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java index 42460b5943e..01e9a173d64 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java @@ -485,7 +485,6 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta // TODO: remove as many temporal parameter dependencies as possible here. Currently duplication of state. stateChangeHandler.reconfigureFromOptions(options); - stateChangeHandler.setStateChangedFlag(); // Always trigger state recomputation after reconfig masterElectionHandler.setFleetControllerCount(options.fleetControllerCount()); masterElectionHandler.setMasterZooKeeperCooldownPeriod(options.masterZooKeeperCooldownPeriod()); diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java index 28149477e36..2317777e43d 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java @@ -234,6 +234,7 @@ public class StateChangeHandler { setMaxInitProgressTime(options.maxInitProgressTime()); setMaxSlobrokDisconnectGracePeriod(options.maxSlobrokDisconnectGracePeriod()); setMaxTransitionTime(options.maxTransitionTime()); + setStateChangedFlag(); // Always trigger state recomputation after reconfig } // TODO too many hidden behavior dependencies between this and the actually |