(7.4 Backport) Rename CC_ENABLE_REMOTE_LOG_ROUTER_MONITORING to CC_ENABLE_REMOTE_LOG_ROUTER_DISCONNECT_MONITORING (#12369)
* Rename CC_ENABLE_REMOTE_LOG_ROUTER_MONITORING to CC_ENABLE_REMOTE_LOG_ROUTER_DISCONNECT_MONITORING * Fix spacing
This commit is contained in:
parent
0b0c5156d6
commit
d20a925e12
|
|
@ -833,7 +833,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
|
|||
init( CC_SATELLITE_DEGRADATION_MIN_COMPLAINER, 3 );
|
||||
init( CC_SATELLITE_DEGRADATION_MIN_BAD_SERVER, 3 );
|
||||
init( CC_ENABLE_REMOTE_LOG_ROUTER_DEGRADATION_MONITORING, false);
|
||||
init( CC_ENABLE_REMOTE_LOG_ROUTER_MONITORING, true);
|
||||
init( CC_ENABLE_REMOTE_LOG_ROUTER_DISCONNECT_MONITORING, true);
|
||||
init( CC_ENABLE_REMOTE_TLOG_DEGRADATION_MONITORING, false); if (isSimulated) CC_ENABLE_REMOTE_TLOG_DEGRADATION_MONITORING = deterministicRandom()->coinflip();
|
||||
init( CC_ENABLE_REMOTE_TLOG_DISCONNECT_MONITORING, false); if (isSimulated) CC_ENABLE_REMOTE_TLOG_DISCONNECT_MONITORING = deterministicRandom()->coinflip();
|
||||
init( CC_ONLY_CONSIDER_INTRA_DC_LATENCY, false); if (isSimulated) CC_ONLY_CONSIDER_INTRA_DC_LATENCY = deterministicRandom()->coinflip();
|
||||
|
|
|
|||
|
|
@ -828,9 +828,9 @@ public:
|
|||
// remote log routers are experiencing degradation
|
||||
// (latency) with their peers. Gray failure may trigger
|
||||
// recovery based on this.
|
||||
bool CC_ENABLE_REMOTE_LOG_ROUTER_MONITORING; // When enabled, gray failure tries to detect whether
|
||||
// remote log routers are disconnected from their peers. Gray failure
|
||||
// may trigger recovery based on this.
|
||||
bool CC_ENABLE_REMOTE_LOG_ROUTER_DISCONNECT_MONITORING; // When enabled, gray failure tries to detect whether
|
||||
// remote log routers are disconnected from their peers.
|
||||
// Gray failure may trigger recovery based on this.
|
||||
bool CC_ENABLE_REMOTE_TLOG_DEGRADATION_MONITORING; // When enabled, gray failure tries to detect whether remote
|
||||
// tlogs are experiencing degradation (latency) with their peers.
|
||||
// Gray failure may trigger recovery based on this.
|
||||
|
|
|
|||
|
|
@ -201,10 +201,11 @@ bool ClusterControllerData::transactionSystemContainsDegradedServers() {
|
|||
/*skipRemoteLogRouter*/
|
||||
!(SERVER_KNOBS->CC_ONLY_CONSIDER_INTRA_DC_LATENCY &&
|
||||
SERVER_KNOBS->CC_ENABLE_REMOTE_LOG_ROUTER_DEGRADATION_MONITORING)) ||
|
||||
transactionWorkerInList(degradationInfo.disconnectedServers,
|
||||
/*skipSatellite=*/false,
|
||||
/*skipRemoteTLog=*/!SERVER_KNOBS->CC_ENABLE_REMOTE_TLOG_DISCONNECT_MONITORING,
|
||||
/*skipRemoteLogRouter*/ !SERVER_KNOBS->CC_ENABLE_REMOTE_LOG_ROUTER_MONITORING);
|
||||
transactionWorkerInList(
|
||||
degradationInfo.disconnectedServers,
|
||||
/*skipSatellite=*/false,
|
||||
/*skipRemoteTLog=*/!SERVER_KNOBS->CC_ENABLE_REMOTE_TLOG_DISCONNECT_MONITORING,
|
||||
/*skipRemoteLogRouter*/ !SERVER_KNOBS->CC_ENABLE_REMOTE_LOG_ROUTER_DISCONNECT_MONITORING);
|
||||
}
|
||||
|
||||
bool ClusterControllerData::remoteTransactionSystemContainsDegradedServers() {
|
||||
|
|
@ -3916,7 +3917,7 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerRecoveryDueToDegradedServer
|
|||
}
|
||||
|
||||
// Trigger recovery when remote log router is disconnected.
|
||||
if (SERVER_KNOBS->CC_ENABLE_REMOTE_LOG_ROUTER_MONITORING) {
|
||||
if (SERVER_KNOBS->CC_ENABLE_REMOTE_LOG_ROUTER_DISCONNECT_MONITORING) {
|
||||
data.degradationInfo.disconnectedServers.insert(logRouter);
|
||||
ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
|
||||
data.degradationInfo.disconnectedServers.clear();
|
||||
|
|
|
|||
Loading…
Reference in New Issue