aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-core
diff options
context:
space:
mode:
Diffstat (limited to 'clustercontroller-core')
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java9
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());