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

fix roll trace event issue for data distribution(master) 

Description

Testing
This commit is contained in:
Chang Liu 2021-09-24 19:46:51 +00:00 committed by A.J. Beamon
parent 731c1fffac
commit 8761960cdc
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fdbserver/DataDistribution.actor.cpp
View File

@ -5711,13 +5711,14 @@ ACTOR Future<Void> dataDistributionTeamCollection(
.detail("ServerCount", self->server_info.size())
.detail("StorageTeamSize", self->configuration.storageTeamSize)
.detail("HighestPriority", highestPriority)
.trackLatest(self->primary
? "TotalDataInFlight"
: "TotalDataInFlightRemote"); // this track event's lifestyle is contolled by
// totalDataInFlightEventHolder or
// totalDataInFlightRemoteEventHolder in
// DataDistribution.actor.cpp. Please make sure the
// keys in both places are matched.
.trackLatest(
self->primary
? "TotalDataInFlight"
: "TotalDataInFlightRemote"); // This trace event's trackLatest lifetime is controlled by
// DataDistributorData::totalDataInFlightEventHolder or
// DataDistributorData::totalDataInFlightRemoteEventHolder. The
// track latest key we use here must match the key used in the
// holder.
loggingTrigger = delay(SERVER_KNOBS->DATA_DISTRIBUTION_LOGGING_INTERVAL, TaskPriority::FlushTrace);
}

6
fdbserver/DataDistributionQueue.actor.cpp
View File

@ -1682,9 +1682,9 @@ ACTOR Future<Void> dataDistributionQueue(Database cx,
.detail("PriorityTeam1Left", self.priority_relocations[SERVER_KNOBS->PRIORITY_TEAM_1_LEFT])
.detail("PriorityTeam0Left", self.priority_relocations[SERVER_KNOBS->PRIORITY_TEAM_0_LEFT])
.detail("PrioritySplitShard", self.priority_relocations[SERVER_KNOBS->PRIORITY_SPLIT_SHARD])
.trackLatest("MovingData"); // this track event's lifestyle is contolled by
// movingDataEventHolder in DataDistribution.actor.cpp. Please make
// sure the keys in both places are matched.
.trackLatest("MovingData"); // This trace event's trackLatest lifetime is controlled by
// DataDistributorData::movingDataEventHolder. The track latest key
// we use here must match the key used in the holder.
}
when(wait(self.error.getFuture())) {} // Propagate errors from dataDistributionRelocator
when(wait(waitForAll(balancingFutures))) {}