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

fix getMetrics keys bug

This commit is contained in:
Xiaoxi Wang 2022-04-24 17:10:58 -07:00
parent a0b45c2962
commit cc05f5e9db
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/DataDistribution.actor.h
View File

@ -152,13 +152,13 @@ struct GetTeamRequest {
};
struct GetMetricsRequest {
// whether a < b
// whether a > b
typedef std::function<bool(const StorageMetrics& a, const StorageMetrics& b)> MetricsComparator;
std::vector<KeyRange> keys;
int topK = 1; // default only return the top 1 shard based on the comparator
Promise<std::vector<StorageMetrics>> reply; // topK storage metrics
Optional<MetricsComparator>
comparator; // if comparator is assigned, return the largest topK in keys, otherwise return the sum of metrics
comparator; // Return true if a.score > b.score.if comparator is assigned, return the largest topK in keys, otherwise return the sum of metrics
GetMetricsRequest() {}
GetMetricsRequest(KeyRange const& keys, int topK = 1) : keys({ keys }), topK(topK) {}

19
fdbserver/DataDistributionQueue.actor.cpp
View File

@ -1081,7 +1081,7 @@ struct DDQueueData {
bool timeThrottle(const std::vector<UID>& ids) const {
return std::any_of(ids.begin(), ids.end(), [this](const UID& id) {
if (this->lastAsSource.count(id)) {
return (now() - this->lastAsSource.at(id)) * 3.0 < SERVER_KNOBS->STORAGE_METRICS_AVERAGE_INTERVAL;
return (now() - this->lastAsSource.at(id)) * 5.0 < SERVER_KNOBS->STORAGE_METRICS_AVERAGE_INTERVAL;
}
return false;
});
@ -1504,10 +1504,15 @@ ACTOR Future<Void> dataDistributionRelocator(DDQueueData* self, RelocateData rd,
}
}
inline double getWorstCpu(const HealthMetrics& metrics) {
inline double getWorstCpu(const HealthMetrics& metrics, const std::vector<UID>& ids) {
double cpu = 0;
for (auto p : metrics.storageStats) {
cpu = std::max(cpu, p.second.cpuUsage);
for (auto& id : ids) {
if (metrics.storageStats.count(id)) {
cpu = std::max(cpu, metrics.storageStats.at(id).cpuUsage);
} else {
// assume the server is too busy to report its stats
cpu = std::max(cpu, 100.0);
}
}
return cpu;
}
@ -1546,12 +1551,12 @@ ACTOR Future<bool> rebalanceReadLoad(DDQueueData* self,
state Future<HealthMetrics> healthMetrics = self->cx->getHealthMetrics(true);
state GetMetricsRequest req(shards, 10);
req.comparator = [](const StorageMetrics& a, const StorageMetrics& b) {
return a.bytesReadPerKSecond / std::max(a.bytes * 1.0, 1.0 * SERVER_KNOBS->MIN_SHARD_BYTES) <
return a.bytesReadPerKSecond / std::max(a.bytes * 1.0, 1.0 * SERVER_KNOBS->MIN_SHARD_BYTES) >
b.bytesReadPerKSecond / std::max(b.bytes * 1.0, 1.0 * SERVER_KNOBS->MIN_SHARD_BYTES);
};
state std::vector<StorageMetrics> metricsList = wait(brokenPromiseToNever(self->getShardMetrics.getReply(req)));
wait(ready(healthMetrics));
if (getWorstCpu(healthMetrics.get()) < 25.0) { // 25%
if (getWorstCpu(healthMetrics.get(), sourceTeam->getServerIDs()) < 25.0) { // 25%
traceEvent->detail("SkipReason", "LowReadLoad");
return false;
}
@ -1559,7 +1564,7 @@ ACTOR Future<bool> rebalanceReadLoad(DDQueueData* self,
deterministicRandom()->randomShuffle(metricsList);
int chosenIdx = -1;
for (int i = 0; i < metricsList.size(); ++i) {
if (metricsList[i].keys.present() && metricsList[i].bytes > 0) {
if (metricsList[i].keys.present() && metricsList[i].bytesReadPerKSecond > 0) {
chosenIdx = i;
break;
}

5
fdbserver/DataDistributionTracker.actor.cpp
View File

@ -856,6 +856,7 @@ ACTOR Future<Void> fetchShardMetrics_impl(DataDistributionTracker* self, GetMetr
}
if (req.comparator.present()) {
metrics.keys = range;
returnMetrics.push_back(metrics);
} else {
returnMetrics[0] += metrics;
@ -867,11 +868,11 @@ ACTOR Future<Void> fetchShardMetrics_impl(DataDistributionTracker* self, GetMetr
req.reply.send(returnMetrics);
else if (req.comparator.present()) {
std::nth_element(returnMetrics.begin(),
returnMetrics.end() - req.topK,
returnMetrics.begin() + req.topK - 1,
returnMetrics.end(),
req.comparator.get());
req.reply.send(
std::vector<StorageMetrics>(returnMetrics.rbegin(), returnMetrics.rbegin() + req.topK));
std::vector<StorageMetrics>(returnMetrics.begin(), returnMetrics.begin() + req.topK));
}
return Void();
}