diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index ef8c25b2b6..1bfbf05d59 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -1213,7 +1213,7 @@ struct DDTeamCollection : ReferenceCounted { TraceEvent("ServerTeamInfo") .detail("TeamIndex", i++) .detail("Healthy", team->isHealthy()) - .detail("ServerNumber", team->size()) + .detail("TeamSize", team->size()) .detail("MemberIDs", team->getServerIDsStr()); } } @@ -1241,7 +1241,7 @@ struct DDTeamCollection : ReferenceCounted { TraceEvent("MachineTeamInfo") .detail("TeamIndex", i++) .detail("MachineIDs", team->getMachineIDsStr()) - .detail("ServerTeamNumber", team->serverTeams.size()); + .detail("ServerTeams", team->serverTeams.size()); } } @@ -1529,7 +1529,7 @@ struct DDTeamCollection : ReferenceCounted { // If we cannot find a healthy machine team TraceEvent("NoHealthyMachineTeamForServer") .detail("ServerID", chosenServer->id) - .detail("MachineTeamsNumber", chosenServer->machine->machineTeams.size()); + .detail("MachineTeams", chosenServer->machine->machineTeams.size()); return Reference(); } @@ -1603,7 +1603,7 @@ struct DDTeamCollection : ReferenceCounted { TraceEvent(SevError, "ServerTeamNumberOnMachineIncorrect") .detail("MachineTeam", mt->getMachineIDsStr()) .detail("ServerTeamsSize", mt->serverTeams.size()) - .detail("CountedServerTeamNumber", num); + .detail("CountedServerTeams", num); } return ret; } @@ -1693,7 +1693,7 @@ struct DDTeamCollection : ReferenceCounted { // We may face the situation that temporarily we have no healthy machine. TraceEvent(SevWarn, "MachineTeamNotFound") .detail("Primary", primary) - .detail("MachineTeamNumber", machineTeams.size()); + .detail("MachineTeams", machineTeams.size()); continue; // try randomly to find another least used server } @@ -1762,17 +1762,17 @@ struct DDTeamCollection : ReferenceCounted { TraceEvent("TeamCollectionInfo", distributorId) .detail("Primary", primary) - .detail("AddedTeamNumber", addedTeams) - .detail("AimToBuildTeamNumber", teamsToBuild) - .detail("CurrentTeamNumber", teams.size()) - .detail("DesiredTeamNumber", desiredTeamNumber) - .detail("MaxTeamNumber", maxTeamNumber) + .detail("AddedTeams", addedTeams) + .detail("TeamsToBuild", teamsToBuild) + .detail("CurrentTeams", teams.size()) + .detail("DesiredTeams", desiredTeamNumber) + .detail("MaxTeams", maxTeamNumber) .detail("StorageTeamSize", configuration.storageTeamSize) - .detail("CurrentMachineTeamNumber", machineTeams.size()) - .detail("CurrentHealthyMachineTeamNumber", healthyMachineTeamCount) + .detail("CurrentMachineTeams", machineTeams.size()) + .detail("CurrentHealthyMachineTeams", healthyMachineTeamCount) .detail("DesiredMachineTeams", desiredMachineTeams) .detail("MaxMachineTeams", maxMachineTeams) - .detail("TotalHealthyMachine", totalHealthyMachineCount) + .detail("TotalHealthyMachines", totalHealthyMachineCount) .trackLatest("TeamCollectionInfo"); return addedTeams; @@ -1791,17 +1791,17 @@ struct DDTeamCollection : ReferenceCounted { TraceEvent("TeamCollectionInfo", distributorId) .detail("Primary", primary) - .detail("AddedTeamNumber", 0) - .detail("AimToBuildTeamNumber", 0) - .detail("CurrentTeamNumber", teams.size()) - .detail("DesiredTeamNumber", desiredServerTeams) - .detail("MaxTeamNumber", maxServerTeams) + .detail("AddedTeams", 0) + .detail("TeamsToBuild", 0) + .detail("CurrentTeams", teams.size()) + .detail("DesiredTeams", desiredServerTeams) + .detail("MaxTeams", maxServerTeams) .detail("StorageTeamSize", configuration.storageTeamSize) - .detail("CurrentMachineTeamNumber", machineTeams.size()) - .detail("CurrentHealthyMachineTeamNumber", healthyMachineTeamCount) + .detail("CurrentMachineTeams", machineTeams.size()) + .detail("CurrentHealthyMachineTeams", healthyMachineTeamCount) .detail("DesiredMachineTeams", desiredMachineTeams) .detail("MaxMachineTeams", maxMachineTeams) - .detail("TotalHealthyMachine", totalHealthyMachineCount) + .detail("TotalHealthyMachines", totalHealthyMachineCount) .trackLatest("TeamCollectionInfo"); // Debug purpose @@ -1835,7 +1835,7 @@ struct DDTeamCollection : ReferenceCounted { } uniqueMachines = machines.size(); TraceEvent("BuildTeams") - .detail("ServerNumber", self->server_info.size()) + .detail("ServerCount", self->server_info.size()) .detail("UniqueMachines", uniqueMachines) .detail("Primary", self->primary) .detail("StorageTeamSize", self->configuration.storageTeamSize); @@ -1900,17 +1900,17 @@ struct DDTeamCollection : ReferenceCounted { TraceEvent("TeamCollectionInfo", self->distributorId) .detail("Primary", self->primary) - .detail("AddedTeamNumber", 0) - .detail("AimToBuildTeamNumber", teamsToBuild) - .detail("CurrentTeamNumber", self->teams.size()) - .detail("DesiredTeamNumber", desiredTeams) - .detail("MaxTeamNumber", maxTeams) + .detail("AddedTeams", 0) + .detail("TeamsToBuild", teamsToBuild) + .detail("CurrentTeams", self->teams.size()) + .detail("DesiredTeams", desiredTeams) + .detail("MaxTeams", maxTeams) .detail("StorageTeamSize", self->configuration.storageTeamSize) - .detail("CurrentMachineTeamNumber", self->machineTeams.size()) - .detail("CurrentHealthyMachineTeamNumber", healthyMachineTeamCount) + .detail("CurrentMachineTeams", self->machineTeams.size()) + .detail("CurrentHealthyMachineTeams", healthyMachineTeamCount) .detail("DesiredMachineTeams", desiredMachineTeams) .detail("MaxMachineTeams", maxMachineTeams) - .detail("TotalHealthyMachine", totalHealthyMachineCount) + .detail("TotalHealthyMachines", totalHealthyMachineCount) .trackLatest("TeamCollectionInfo"); } } @@ -2167,7 +2167,7 @@ struct DDTeamCollection : ReferenceCounted { } if (removedCount == 0) { - TraceEvent(SevInfo, "NoneTeamRemovedWhenServerRemoved") + TraceEvent(SevInfo, "NoTeamsRemovedWhenServerRemoved") .detail("Primary", primary) .detail("Debug", "ThisShouldRarelyHappen_CheckInfoBelow"); traceAllInfo(); @@ -2282,10 +2282,10 @@ ACTOR Future teamRemover(DDTeamCollection* self) { // int currentHealthyMTCount = self->getHealthyMachineTeamCount(); // if (currentHealthyMTCount != self->machineTeams.size()) { // TraceEvent(SevError, "InvalidAssumption") - // .detail("healthyMachineCount", healthyMachineCount) - // .detail("MachineNumber", self->machine_info.size()) + // .detail("HealthyMachineCount", healthyMachineCount) + // .detail("Machines", self->machine_info.size()) // .detail("CurrentHealthyMTCount", currentHealthyMTCount) - // .detail("MachineTeamNumber", self->machineTeams.size()); + // .detail("MachineTeams", self->machineTeams.size()); // self->traceAllInfo(true); // } @@ -2328,8 +2328,8 @@ ACTOR Future teamRemover(DDTeamCollection* self) { TraceEvent("TeamRemover") .detail("MachineTeamToRemove", mt->getMachineIDsStr()) .detail("NumProcessTeamsOnTheMachineTeam", minNumProcessTeams) - .detail("CurrentMachineTeamNumber", self->machineTeams.size()) - .detail("DesiredMachineTeam", desiredMachineTeams); + .detail("CurrentMachineTeams", self->machineTeams.size()) + .detail("DesiredMachineTeams", desiredMachineTeams); // Remove the machine team bool foundRemovedMachineTeam = self->removeMachineTeam(mt); @@ -2342,11 +2342,11 @@ ACTOR Future teamRemover(DDTeamCollection* self) { if (numMachineTeamRemoved > 0) { // Only trace the information when we remove a machine team TraceEvent("TeamRemoverDone") - .detail("HealthyMachineNumber", healthyMachineCount) - // .detail("CurrentHealthyMachineTeamNumber", currentHealthyMTCount) - .detail("CurrentMachineTeamNumber", self->machineTeams.size()) - .detail("DesiredMachineTeam", desiredMachineTeams) - .detail("NumMachineTeamRemoved", numMachineTeamRemoved); + .detail("HealthyMachines", healthyMachineCount) + // .detail("CurrentHealthyMachineTeams", currentHealthyMTCount) + .detail("CurrentMachineTeams", self->machineTeams.size()) + .detail("DesiredMachineTeams", desiredMachineTeams) + .detail("NumMachineTeamsRemoved", numMachineTeamRemoved); self->traceTeamCollectionInfo(); } } @@ -3369,7 +3369,7 @@ ACTOR Future dataDistributionTeamCollection( .detail("Primary", self->primary) .detail("TotalBytes", self->getDebugTotalDataInFlight()) .detail("UnhealthyServers", self->unhealthyServers) - .detail("ServerNumber", self->server_info.size()) + .detail("ServerCount", self->server_info.size()) .detail("StorageTeamSize", self->configuration.storageTeamSize) .detail("HighestPriority", highestPriority) .trackLatest(self->primary ? "TotalDataInFlight" : "TotalDataInFlightRemote"); diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp index 6224c8e75a..9667938864 100644 --- a/fdbserver/QuietDatabase.actor.cpp +++ b/fdbserver/QuietDatabase.actor.cpp @@ -283,13 +283,13 @@ ACTOR Future getTeamCollectionValid(Database cx, WorkerInterface dataDistr TraceEvent("GetTeamCollectionValid").detail("Stage", "GotString"); - int64_t currentTeamNumber = boost::lexical_cast(teamCollectionInfoMessage.getValue("CurrentTeamNumber")); - int64_t desiredTeamNumber = boost::lexical_cast(teamCollectionInfoMessage.getValue("DesiredTeamNumber")); - int64_t maxTeamNumber = boost::lexical_cast(teamCollectionInfoMessage.getValue("MaxTeamNumber")); - int64_t currentMachineTeamNumber = boost::lexical_cast(teamCollectionInfoMessage.getValue("CurrentMachineTeamNumber")); - int64_t healthyMachineTeamCount = boost::lexical_cast(teamCollectionInfoMessage.getValue("CurrentHealthyMachineTeamNumber")); - int64_t desiredMachineTeamNumber = boost::lexical_cast(teamCollectionInfoMessage.getValue("DesiredMachineTeams")); - int64_t maxMachineTeamNumber = boost::lexical_cast(teamCollectionInfoMessage.getValue("MaxMachineTeams")); + int64_t currentTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("CurrentTeams")); + int64_t desiredTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("DesiredTeams")); + int64_t maxTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("MaxTeams")); + int64_t currentMachineTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("CurrentMachineTeams")); + int64_t healthyMachineTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("CurrentHealthyMachineTeams")); + int64_t desiredMachineTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("DesiredMachineTeams")); + int64_t maxMachineTeams = boost::lexical_cast(teamCollectionInfoMessage.getValue("MaxMachineTeams")); // Team number is always valid when we disable teamRemover. This avoids false positive in simulation test if (SERVER_KNOBS->TR_FLAG_DISABLE_TEAM_REMOVER) { @@ -300,15 +300,15 @@ ACTOR Future getTeamCollectionValid(Database cx, WorkerInterface dataDistr // The if condition should be consistent with the condition in teamRemover() that decides // if redundant teams exist. - if (healthyMachineTeamCount > desiredMachineTeamNumber) { + if (healthyMachineTeams > desiredMachineTeams) { TraceEvent("GetTeamCollectionValid") - .detail("CurrentTeamNumber", currentTeamNumber) - .detail("DesiredTeamNumber", desiredTeamNumber) - .detail("MaxTeamNumber", maxTeamNumber) - .detail("CurrentHealthyMachineTeamNumber", healthyMachineTeamCount) - .detail("DesiredMachineTeams", desiredMachineTeamNumber) - .detail("CurrentMachineTeamNumber", currentMachineTeamNumber) - .detail("MaxMachineTeams", maxMachineTeamNumber); + .detail("CurrentTeams", currentTeams) + .detail("DesiredTeams", desiredTeams) + .detail("MaxTeams", maxTeams) + .detail("CurrentHealthyMachineTeams", healthyMachineTeams) + .detail("DesiredMachineTeams", desiredMachineTeams) + .detail("CurrentMachineTeams", currentMachineTeams) + .detail("MaxMachineTeams", maxMachineTeams); return false; } else { return true;