From 52c6737411a37c91acf5a0a233481ccfa359a33f Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 4 Feb 2020 10:09:16 -0800
Subject: [PATCH] Rename backupLoggingEnabled as backupWorkerEnabled
To highlight the changes for 7.0 backup changes. By default,
backup_worker_enabled flag is set for 7.0 version.
---
documentation/sphinx/source/mr-status-json-schemas.rst.inc | 2 +-
fdbclient/DatabaseConfiguration.cpp | 6 +++---
fdbclient/DatabaseConfiguration.h | 2 +-
fdbclient/FileBackupAgent.actor.cpp | 2 +-
fdbclient/Schemas.cpp | 2 +-
fdbserver/ClusterController.actor.cpp | 4 ++--
fdbserver/SimulatedCluster.actor.cpp | 2 +-
fdbserver/TagPartitionedLogSystem.actor.cpp | 4 ++--
fdbserver/masterserver.actor.cpp | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index 94ecd2928e..c7e52d5e7b 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -557,7 +557,7 @@
"auto_proxies":3,
"auto_resolvers":1,
"auto_logs":3,
- "backup_logging_enabled":1,
+ "backup_worker_enabled":1,
"proxies":5 // this field will be absent if a value has not been explicitly set
},
"data":{
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 66caf0081f..a1fef596c3 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -41,7 +41,7 @@ void DatabaseConfiguration::resetInternal() {
tLogPolicy = storagePolicy = remoteTLogPolicy = Reference<IReplicationPolicy>();
remoteDesiredTLogCount = -1;
remoteTLogReplicationFactor = repopulateRegionAntiQuorum = 0;
- backupLoggingEnabled = true;
+ backupWorkerEnabled = true;
}
void parse( int* i, ValueRef const& v ) {
@@ -324,7 +324,7 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
result["auto_logs"] = autoDesiredTLogCount;
}
- result["backup_logging_enabled"] = (int32_t)backupLoggingEnabled;
+ result["backup_worker_enabled"] = (int32_t)backupWorkerEnabled;
}
return result;
@@ -437,7 +437,7 @@ bool DatabaseConfiguration::setInternal(KeyRef key, ValueRef value) {
else if (ck == LiteralStringRef("remote_logs")) parse(&remoteDesiredTLogCount, value);
else if (ck == LiteralStringRef("remote_log_replicas")) parse(&remoteTLogReplicationFactor, value);
else if (ck == LiteralStringRef("remote_log_policy")) parseReplicationPolicy(&remoteTLogPolicy, value);
- else if (ck == LiteralStringRef("backup_logging_enabled")) { parse((&type), value); backupLoggingEnabled = (type != 0); }
+ else if (ck == LiteralStringRef("backup_worker_enabled")) { parse((&type), value); backupWorkerEnabled = (type != 0); }
else if (ck == LiteralStringRef("usable_regions")) parse(&usableRegions, value);
else if (ck == LiteralStringRef("repopulate_anti_quorum")) parse(&repopulateRegionAntiQuorum, value);
else if (ck == LiteralStringRef("regions")) parse(®ions, value);
diff --git a/fdbclient/DatabaseConfiguration.h b/fdbclient/DatabaseConfiguration.h
index 2f8566db36..e085e003bd 100644
--- a/fdbclient/DatabaseConfiguration.h
+++ b/fdbclient/DatabaseConfiguration.h
@@ -179,7 +179,7 @@ struct DatabaseConfiguration {
Reference<IReplicationPolicy> remoteTLogPolicy;
// Backup Workers
- bool backupLoggingEnabled;
+ bool backupWorkerEnabled;
//Data centers
int32_t usableRegions;
diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
index 61c36e694d..4250f4c5d6 100644
--- a/fdbclient/FileBackupAgent.actor.cpp
+++ b/fdbclient/FileBackupAgent.actor.cpp
@@ -2387,7 +2387,7 @@ namespace fileBackup {
// Check if backup worker is enabled
DatabaseConfiguration dbConfig = wait(getDatabaseConfiguration(cx));
- if (!dbConfig.backupLoggingEnabled) {
+ if (!dbConfig.backupWorkerEnabled) {
return Void();
}
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index f25af4edb7..c4253bd0af 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -591,7 +591,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
"auto_resolvers":1,
"auto_logs":3,
"proxies":5,
- "backup_logging_enabled":1
+ "backup_worker_enabled":1
},
"data":{
"least_operating_space_bytes_log_server":0,
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index db37590514..889b32b1d8 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -780,7 +780,7 @@ public:
}
}
- if (req.configuration.backupLoggingEnabled) {
+ if (req.configuration.backupWorkerEnabled) {
const int nBackup = std::max<int>(
(req.configuration.desiredLogRouterCount > 0 ? req.configuration.desiredLogRouterCount : tlogs.size()),
req.maxOldLogRouters);
@@ -916,7 +916,7 @@ public:
for(int i = 0; i < proxies.size(); i++)
result.proxies.push_back(proxies[i].interf);
- if (req.configuration.backupLoggingEnabled) {
+ if (req.configuration.backupWorkerEnabled) {
const int nBackup = std::max<int>(tlogs.size(), req.maxOldLogRouters);
auto backupWorkers = getWorkersForRoleInDatacenter(dcId, ProcessClass::Backup, nBackup,
req.configuration, id_used);
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index fe9baf3a9e..ef66d0dc55 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -878,7 +878,7 @@ void SimulationConfig::generateNormalConfig(int minimumReplication, int minimumR
ASSERT(false); // Programmer forgot to adjust cases.
}
- set_config("backup_logging_enabled:=1");
+ set_config("backup_worker_enabled:=1");
if (deterministicRandom()->random01() < 0.5) {
int logSpill = deterministicRandom()->randomInt( TLogSpillType::VALUE, TLogSpillType::END );
set_config(format("log_spill:=%d", logSpill));
diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index 6f446e7446..3c91c0e501 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -2144,11 +2144,11 @@ struct TagPartitionedLogSystem : ILogSystem, ReferenceCounted<TagPartitionedLogS
logSystem->addPseudoLocality(tagLocalityLogRouterMapped);
TraceEvent e("AddPseudoLocality", logSystem->getDebugID());
e.detail("Locality1", "LogRouterMapped");
- if (configuration.backupLoggingEnabled) {
+ if (configuration.backupWorkerEnabled) {
logSystem->addPseudoLocality(tagLocalityBackup);
e.detail("Locality2", "Backup");
}
- } else if (configuration.backupLoggingEnabled) {
+ } else if (configuration.backupWorkerEnabled) {
// Single region uses log router tag for backup workers.
logSystem->logRouterTags = recr.tLogs.size() * std::max<int>(1, configuration.desiredLogRouterCount / std::max<int>(1, recr.tLogs.size()));
logSystem->addPseudoLocality(tagLocalityBackup);
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index 9a1f5367c0..f9bc13916b 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -1525,7 +1525,7 @@ ACTOR Future<Void> masterCore( Reference<MasterData> self ) {
self->addActor.send( changeCoordinators(self) );
Database cx = openDBOnServer(self->dbInfo, TaskPriority::DefaultEndpoint, true, true);
self->addActor.send(configurationMonitor(self, cx));
- if (self->configuration.backupLoggingEnabled) {
+ if (self->configuration.backupWorkerEnabled) {
self->addActor.send(recruitBackupWorkers(self, cx));
}