diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp index b8f17522643..8979b17fce2 100644 --- a/fdbclient/ServerKnobs.cpp +++ b/fdbclient/ServerKnobs.cpp @@ -774,17 +774,16 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi init( COORDINATOR_REGISTER_INTERVAL, 5.0 ); init( CLIENT_REGISTER_INTERVAL, 600.0 ); init( CC_ENABLE_WORKER_HEALTH_MONITOR, false ); if (isSimulated) CC_ENABLE_WORKER_HEALTH_MONITOR = true; - init( CC_PAUSE_HEALTH_MONITOR, false, Atomic::NO ); init( CC_WORKER_HEALTH_CHECKING_INTERVAL, 60.0 ); init( CC_DEGRADED_LINK_EXPIRATION_INTERVAL, 300.0 ); init( CC_MIN_DEGRADATION_INTERVAL, 120.0 ); init( ENCRYPT_KEY_PROXY_FAILURE_TIME, 0.1 ); if ( isSimulated ) ENCRYPT_KEY_PROXY_FAILURE_TIME = 1.0 + deterministicRandom()->random01(); init( CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE, 3 ); init( CC_MAX_EXCLUSION_DUE_TO_HEALTH, 2 ); - init( CC_HEALTH_TRIGGER_RECOVERY, false ); + init( CC_HEALTH_TRIGGER_RECOVERY, false, Atomic::NO ); init( CC_TRACKING_HEALTH_RECOVERY_INTERVAL, 3600.0 ); init( CC_MAX_HEALTH_RECOVERY_COUNT, 5 ); - init( CC_HEALTH_TRIGGER_FAILOVER, false ); + init( CC_HEALTH_TRIGGER_FAILOVER, false, Atomic::NO ); init( CC_FAILOVER_DUE_TO_HEALTH_MIN_DEGRADATION, 5 ); init( CC_FAILOVER_DUE_TO_HEALTH_MAX_DEGRADATION, 10 ); init( CC_ENABLE_ENTIRE_SATELLITE_MONITORING, false ); diff --git a/fdbclient/include/fdbclient/ServerKnobs.h b/fdbclient/include/fdbclient/ServerKnobs.h index 9a07ef4927b..a5150c8a17e 100644 --- a/fdbclient/include/fdbclient/ServerKnobs.h +++ b/fdbclient/include/fdbclient/ServerKnobs.h @@ -728,7 +728,6 @@ class SWIFT_CXX_IMMORTAL_SINGLETON_TYPE ServerKnobs : public KnobsImpl workerHealthMonitor(ClusterControllerData* self) { // Check if the cluster controller should trigger a recovery to exclude any degraded servers from // the transaction system. - if (SERVER_KNOBS->CC_PAUSE_HEALTH_MONITOR) { - TraceEvent(SevWarnAlways, "HealthMonitorPaused"); - } else if (self->shouldTriggerRecoveryDueToDegradedServers()) { + if (self->shouldTriggerRecoveryDueToDegradedServers()) { if (SERVER_KNOBS->CC_HEALTH_TRIGGER_RECOVERY) { if (self->recentRecoveryCountDueToHealth() < SERVER_KNOBS->CC_MAX_HEALTH_RECOVERY_COUNT) { self->recentHealthTriggeredRecoveryTime.push(now());