diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2021-03-26 11:50:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-26 11:50:14 +0100 |
commit | 0815e187b696bb27aa28c463d3dcb3d5ab8062a6 (patch) | |
tree | 5fda4f841b31ec42ffed50b60f309168d232fb66 | |
parent | 70b7dd27568ede46ec43a918205b58b82a30b3ba (diff) | |
parent | a739ee1abbe7d8da47d9c92a14e3e43e0ba119e6 (diff) |
Merge pull request #17198 from vespa-engine/hakonhall/log-when-transitioning-out-of-cc-moratorium
Log when transitioning out of CC moratorium
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java | 9 |
1 files changed, 3 insertions, 6 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 2a07f9ac300..2f79393a020 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 @@ -714,15 +714,12 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd && currentTime >= nextStateSendTime) { if (inMasterMoratorium) { - log.fine(currentTime < firstAllowedStateBroadcast ? + log.info(currentTime < firstAllowedStateBroadcast ? "Master moratorium complete: all nodes have reported in" : "Master moratorium complete: timed out waiting for all nodes to report in"); - inMasterMoratorium = false; - } - if (currentTime < firstAllowedStateBroadcast) { - log.log(Level.FINE, "Not set to broadcast states just yet, but as we have gotten info from all nodes we can do so safely."); - // Reset timer to only see warning once. + // Reset firstAllowedStateBroadcast to make sure all future times are after firstAllowedStateBroadcast firstAllowedStateBroadcast = currentTime; + inMasterMoratorium = false; } sentAny = systemStateBroadcaster.broadcastNewStateBundleIfRequired( databaseContext, communicator, database.getLastKnownStateBundleVersionWrittenBySelf()); |