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

solve merge conflicts with Custom Replication PR #9710

This commit is contained in:
Xiaoxi Wang 2023-03-20 16:30:40 -07:00
parent 303248b0b7
commit 2b2e465f26
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/DDShardTracker.actor.cpp
View File

@ -1413,7 +1413,7 @@ DataDistributionTracker::DataDistributionTracker(DataDistributionTrackerInitPara
output(params.output), shardsAffectedByTeamFailure(params.shardsAffectedByTeamFailure),
physicalShardCollection(params.physicalShardCollection), readyToStart(params.readyToStart),
anyZeroHealthyTeams(params.anyZeroHealthyTeams), trackerCancelled(params.trackerCancelled),
ddTenantCache(params.ddTenantCache), customReplication(params.customReplication) {}
ddTenantCache(params.ddTenantCache) {}
DataDistributionTracker::~DataDistributionTracker() {
if (trackerCancelled) {
@ -1428,6 +1428,7 @@ struct DataDistributionTrackerImpl {
state Future<Void> loggingTrigger = Void();
state Future<Void> readHotDetect = readHotDetector(self);
state Reference<EventCacheHolder> ddTrackerStatsEventHolder = makeReference<EventCacheHolder>("DDTrackerStats");
try {
wait(trackInitialShards(self, initData));
initData.clear(); // Release reference count.
@ -1485,6 +1486,7 @@ Future<Void> DataDistributionTracker::run(Reference<DataDistributionTracker> sel
self->getTopKMetrics = getTopKMetrics;
self->getShardMetricsList = getShardMetricsList;
self->averageShardBytes = getAverageShardBytes;
self->customReplication = initData->customReplication;
return holdWhile(self, DataDistributionTrackerImpl::run(self.getPtr(), initData));
}

2
fdbserver/include/fdbserver/DDShardTracker.h
View File

@ -105,6 +105,8 @@ struct DataDistributionTracker : public IDDShardTracker, ReferenceCounted<DataDi
Optional<Reference<TenantCache>> ddTenantCache;
Reference<KeyRangeMap<int>> customReplication;
DataDistributionTracker() = default;
~DataDistributionTracker() override;