diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-03-24 16:42:40 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-03-24 16:42:40 +0100 |
commit | a292a6f6295763a5c463f169e0c660ea8a3d883b (patch) | |
tree | cafe3be26e29cfa739aec253628555c469521190 /clustercontroller-core/src | |
parent | 9f3b5c6b9dc3385a9c8b2011daf7054f339b8796 (diff) |
Make default deadline to first broadcast 30s
Diffstat (limited to 'clustercontroller-core/src')
3 files changed, 5 insertions, 3 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java index 9b1498cd809..41c7c985c0b 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java @@ -171,7 +171,8 @@ public class ContentCluster { /** * Checks if a node can be upgraded - * @param node the node to be checked for upgrad + * + * @param node the node to be checked for upgrad * @param clusterState the current cluster state version * @param condition the upgrade condition * @param oldState the old/current wanted state diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java index 7e67cf27cba..c841f4741ba 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java @@ -95,7 +95,7 @@ public class FleetControllerOptions implements Cloneable { * but should be a few seconds in a real system to prevent new nodes taking over from disturbing the system by * putting out a different systemstate just because all nodes don't answer witihin a single cycle. * The cluster state is allowed to be broadcasted before this time if all nodes have successfully - * reported their state in Slobrok and getnodestate. This value should typically be at least + * reported their state in Slobrok and getnodestate. This value should typically be in the order of * maxSlobrokDisconnectGracePeriod and nodeStateRequestTimeoutMS. */ public long minTimeBeforeFirstSystemStateBroadcast = 0; diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/WantedStateSetter.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/WantedStateSetter.java index 0336853e6e9..ef9885c7cb4 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/WantedStateSetter.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/WantedStateSetter.java @@ -23,5 +23,6 @@ public interface WantedStateSetter { Node node, NodeStateOrHostInfoChangeHandler stateListener, ClusterState currentClusterState, - boolean inMasterMoratorium, boolean probe) throws StateRestApiException; + boolean inMasterMoratorium, + boolean probe) throws StateRestApiException; } |