Merge pull request #7725 from sfc-gh-xwang/fix/main/status

fix storage_metadata disappear because other attribution is missed
This commit is contained in:
Xiaoxi Wang 2022-07-27 17:14:08 -07:00 committed by GitHub
commit 4091a567ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -487,6 +487,11 @@ struct RolesInfo {
double dataLagSeconds = -1.0;
obj["id"] = iface.id().shortString();
obj["role"] = role;
if (iface.metadata.present()) {
obj["storage_metadata"] = iface.metadata.get().toJSON();
// printf("%s\n", metadataObj.getJson().c_str());
}
try {
TraceEventFields const& storageMetrics = metrics.at("StorageMetrics");
@ -594,14 +599,12 @@ struct RolesInfo {
}
}
if (iface.metadata.present()) {
obj["storage_metadata"] = iface.metadata.get().toJSON();
// printf("%s\n", metadataObj.getJson().c_str());
}
} catch (Error& e) {
if (e.code() != error_code_attribute_not_found)
throw e;
else {
TraceEvent(SevWarnAlways, "StorageServerStatusJson").error(e);
}
}
if (pDataLagSeconds) {