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

Fix typo message and remove extra TraceEvent which overwrites the expected one

This commit is contained in:
Yichi Chiang 2017-11-02 10:47:51 -07:00
parent eeaea60f94
commit c033d8efd8
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/Status.actor.cpp
View File

@ -46,7 +46,7 @@ const char* RecoveryStatus::descriptions[] = {
// locking_coordinated_state
"Locking coordination state. Verify that a majority of coordination server processes are active.",
// locking_old_transaction_servers
"Locking old transaction servers. Verify that a least one transaction server from the previous generation is running.",
"Locking old transaction servers. Verify that at least one transaction server from the previous generation is running.",
// reading_transaction_system_state
"Recovering transaction server state. Verify that the transaction server processes are active.",
// configuration_missing

6
fdbserver/masterserver.actor.cpp
View File

@ -996,12 +996,6 @@ ACTOR Future<Void> masterCore( Reference<MasterData> self, PromiseStream<Future<
state vector<Standalone<CommitTransactionRef>> initialConfChanges;
state Future<Void> logChanges;
TraceEvent("MasterRecoveryState", self->dbgid)
.detail("StatusCode", RecoveryStatus::locking_old_transaction_servers)
.detail("Status", RecoveryStatus::names[RecoveryStatus::locking_old_transaction_servers])
.detail("MissingIDs", "")
.trackLatest("MasterRecoveryState");
loop {
Reference<ILogSystem> oldLogSystem = oldLogSystems->get();
if(oldLogSystem) logChanges = triggerUpdates(self, oldLogSystem);