apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 02:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix base trace event name inconsistency

Browse Source
This commit is contained in:
Chaoguang Lin 2021-03-08 15:20:50 -08:00
parent 15168f33f2
commit 9645f489e6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/DataDistribution.actor.cpp
View File

@ -2124,7 +2124,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
.detail("Primary", primary) .detail("Primary", primary)
.detail("AddedTeams", addedTeams) .detail("AddedTeams", addedTeams)
.detail("TeamsToBuild", teamsToBuild) .detail("TeamsToBuild", teamsToBuild)
.detail("CurrentTeams", teams.size()) .detail("CurrentServerTeams", teams.size())
.detail("DesiredTeams", desiredTeams) .detail("DesiredTeams", desiredTeams)
.detail("MaxTeams", maxTeams) .detail("MaxTeams", maxTeams)
.detail("StorageTeamSize", configuration.storageTeamSize) .detail("StorageTeamSize", configuration.storageTeamSize)

5
fdbserver/QuietDatabase.actor.cpp
View File

@ -365,7 +365,8 @@ ACTOR Future<bool> getTeamCollectionValid(Database cx, WorkerInterface dataDistr
TraceEvent("GetTeamCollectionValid").detail("Stage", "GotString"); TraceEvent("GetTeamCollectionValid").detail("Stage", "GotString");
state int64_t currentTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("CurrentTeams")); state int64_t currentTeams =
boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("CurrentServerTeams"));
state int64_t desiredTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("DesiredTeams")); state int64_t desiredTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("DesiredTeams"));
state int64_t maxTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("MaxTeams")); state int64_t maxTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("MaxTeams"));
state int64_t currentMachineTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("CurrentMachineTeams")); state int64_t currentMachineTeams = boost::lexical_cast<int64_t>(teamCollectionInfoMessage.getValue("CurrentMachineTeams"));
@ -411,7 +412,7 @@ ACTOR Future<bool> getTeamCollectionValid(Database cx, WorkerInterface dataDistr
// TODO: Remove the constraint SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER == 3 to ensure that // TODO: Remove the constraint SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER == 3 to ensure that
// the minimun team number per server (and per machine) is always > 0 for any number of replicas // the minimun team number per server (and per machine) is always > 0 for any number of replicas
TraceEvent("GetTeamCollectionValid") TraceEvent("GetTeamCollectionValid")
.detail("CurrentTeams", currentTeams) .detail("CurrentServerTeams", currentTeams)
.detail("DesiredTeams", desiredTeams) .detail("DesiredTeams", desiredTeams)
.detail("MaxTeams", maxTeams) .detail("MaxTeams", maxTeams)
.detail("CurrentHealthyMachineTeams", healthyMachineTeams) .detail("CurrentHealthyMachineTeams", healthyMachineTeams)