diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-01-04 15:49:28 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2021-01-04 15:49:28 +0100 |
commit | 865d68f3ad81b81d0ca1cc7aea5f4664a932647a (patch) | |
tree | 26293a00811a8e71a8507568bc38a569cb6ebf60 /clustercontroller-core | |
parent | 7a5c8ec4f388e2283e2db383f2b37a96c5f0e7ee (diff) |
Always set 'is-master' metric. Remove 'master-change'
Diffstat (limited to 'clustercontroller-core')
2 files changed, 3 insertions, 10 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 9c9e1042c79..ec97e9e1f32 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 @@ -1002,7 +1002,6 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd boolean didWork = false; if (masterElectionHandler.isMaster()) { if ( ! isMaster) { - metricUpdater.becameMaster(); // If we just became master, restore state from ZooKeeper stateChangeHandler.setStateChangedFlag(); systemStateBroadcaster.resetBroadcastedClusterStateBundle(); @@ -1032,12 +1031,12 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd if (isMaster) { eventLog.add(new ClusterEvent(ClusterEvent.Type.MASTER_ELECTION, "This node is no longer fleetcontroller master.", timer.getCurrentTimeInMillis())); firstAllowedStateBroadcast = Long.MAX_VALUE; - metricUpdater.noLongerMaster(); failAllVersionDependentTasks(); } wantedStateChanged = false; isMaster = false; } + metricUpdater.isMaster(isMaster); return didWork; } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java index bc66980db75..8b5255764f3 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java @@ -75,14 +75,8 @@ public class MetricUpdater { metricReporter.set("agreed-master-votes", maxCount); } - public void becameMaster() { - metricReporter.set("is-master", 1); - metricReporter.add("master-change", 1); - } - - public void noLongerMaster() { - metricReporter.set("is-master", 0); - metricReporter.add("master-change", 1); + public void isMaster(boolean isMaster) { + metricReporter.set("is-master", isMaster ? 1 : 0); } public void addTickTime(long millis, boolean didWork) { |