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

Merge pull request #6641 from sfc-gh-xwang/main 

remove some fixme in workload status fetcher
This commit is contained in:
Jingyu Zhou 2022-03-21 13:26:09 -07:00 committed by GitHub
parent fe7892c2d6 66d02d1ebf
commit e47f12d985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbserver/Status.actor.cpp
View File

@ -492,12 +492,7 @@ struct RolesInfo {
obj.setKeyRawNumber("query_queue_max", storageMetrics.getValue("QueryQueueMax"));
obj["total_queries"] = StatusCounter(storageMetrics.getValue("QueryQueue")).getStatus();
obj["finished_queries"] = StatusCounter(storageMetrics.getValue("FinishedQueries")).getStatus();
try { // FIXME: This field was added in a patch release, the try-catch can be removed for the 7.0 release
obj["low_priority_queries"] = StatusCounter(storageMetrics.getValue("LowPriorityQueries")).getStatus();
} catch (Error& e) {
if (e.code() != error_code_attribute_not_found)
throw e;
}
obj["low_priority_queries"] = StatusCounter(storageMetrics.getValue("LowPriorityQueries")).getStatus();
obj["bytes_queried"] = StatusCounter(storageMetrics.getValue("BytesQueried")).getStatus();
obj["keys_queried"] = StatusCounter(storageMetrics.getValue("RowsQueried")).getStatus();
obj["mutation_bytes"] = StatusCounter(storageMetrics.getValue("MutationBytes")).getStatus();
@ -2257,6 +2252,7 @@ ACTOR static Future<JsonBuilderObject> workloadStatusFetcher(
reads.updateValues(StatusCounter(storageMetrics.getValue("FinishedQueries")));
readKeys.updateValues(StatusCounter(storageMetrics.getValue("RowsQueried")));
readBytes.updateValues(StatusCounter(storageMetrics.getValue("BytesQueried")));
lowPriorityReads.updateValues(StatusCounter(storageMetrics.getValue("LowPriorityQueries")));
}
}
@ -2264,21 +2260,7 @@ ACTOR static Future<JsonBuilderObject> workloadStatusFetcher(
operationsObj["reads"] = reads.getStatus();
keysObj["read"] = readKeys.getStatus();
bytesObj["read"] = readBytes.getStatus();
try {
for (auto& ss : storageServers.get()) {
TraceEventFields const& storageMetrics = ss.second.at("StorageMetrics");
if (storageMetrics.size() > 0) {
// FIXME: This field was added in a patch release, for the 7.0 release move this to above loop
lowPriorityReads.updateValues(StatusCounter(storageMetrics.getValue("LowPriorityQueries")));
}
}
operationsObj["low_priority_reads"] = lowPriorityReads.getStatus();
} catch (Error& e) {
if (e.code() != error_code_attribute_not_found)
throw e;
}
operationsObj["low_priority_reads"] = lowPriorityReads.getStatus();
} catch (Error& e) {
if (e.code() == error_code_actor_cancelled)
throw;