wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed redundant field number_of_old_generations_of_tlogs from status json

This commit is contained in:
Xin Dong 2020-09-24 09:44:51 -07:00
parent 77048c3d0f
commit a96d6f85c5
4 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
documentation/sphinx/source/mr-status-json-schemas.rst.inc
View File

@ -447,7 +447,6 @@
], ],
"recovery_state":{ "recovery_state":{
"time_since_last_recovered":1, "time_since_last_recovered":1,
"number_of_old_generations_of_tlogs":1,
"required_resolvers":1, "required_resolvers":1,
"required_proxies":1, "required_proxies":1,
"required_grv_proxies":1, "required_grv_proxies":1,

1
fdbclient/Schemas.cpp
View File

@ -483,7 +483,6 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
R"statusSchema( R"statusSchema(
"recovery_state":{ "recovery_state":{
"time_since_last_recovered":1, "time_since_last_recovered":1,
"number_of_old_generations_of_tlogs":1,
"required_resolvers":1, "required_resolvers":1,
"required_proxies":1, "required_proxies":1,
"required_grv_proxies":1, "required_grv_proxies":1,

3
fdbserver/Status.actor.cpp
View File

@ -1048,15 +1048,12 @@ ACTOR static Future<JsonBuilderObject> recoveryStateStatusFetcher(Database cx, W
const TraceEventFields& dbAvailableMsg = mDBAvailableF.get(); const TraceEventFields& dbAvailableMsg = mDBAvailableF.get();
if (dbAvailableMsg.size() > 0) { if (dbAvailableMsg.size() > 0) {
int64_t availableAtVersion = dbAvailableMsg.getInt64("AvailableAtVersion"); int64_t availableAtVersion = dbAvailableMsg.getInt64("AvailableAtVersion");
int numOfOldGensOfLogs = dbAvailableMsg.getInt("NumOfOldGensOfLogs");
if (!rv.isError()) { if (!rv.isError()) {
double lastRecoveredSecondsAgo = std::max((int64_t)0, (int64_t)(rv.get() - availableAtVersion)) / (double)SERVER_KNOBS->VERSIONS_PER_SECOND; double lastRecoveredSecondsAgo = std::max((int64_t)0, (int64_t)(rv.get() - availableAtVersion)) / (double)SERVER_KNOBS->VERSIONS_PER_SECOND;
message["time_since_last_recovered"] = lastRecoveredSecondsAgo; message["time_since_last_recovered"] = lastRecoveredSecondsAgo;
} }
message["number_of_old_generations_of_tlogs"] = numOfOldGensOfLogs;
} else { } else {
message["time_since_last_db_turned_available_seconds"] = -1; message["time_since_last_db_turned_available_seconds"] = -1;
message["number_of_old_generations_of_tlogs"] = -1;
} }
// Add additional metadata for certain statuses // Add additional metadata for certain statuses

1
fdbserver/masterserver.actor.cpp
View File

@ -1690,7 +1690,6 @@ ACTOR Future<Void> masterCore( Reference<MasterData> self ) {
.trackLatest("MasterRecoveryState"); .trackLatest("MasterRecoveryState");
TraceEvent("MasterRecoveryAvailable", self->dbgid) TraceEvent("MasterRecoveryAvailable", self->dbgid)
.detail("NumOfOldGensOfLogs", self->cstate.myDBState.oldTLogData.size())
.detail("AvailableAtVersion", self->version) .detail("AvailableAtVersion", self->version)
.trackLatest("MasterRecoveryAvailable"); .trackLatest("MasterRecoveryAvailable");