apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-25 17:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Daniel-B-Smith/proxies-status-json

Browse Source 
Add a backwards-compatible 'proxies' field to status json
This commit is contained in:
Daniel Smith 2021-06-09 16:15:38 -04:00 committed by GitHub
commit 513d4df25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions

5
documentation/sphinx/source/mr-status-json-schemas.rst.inc

@ -530,7 +530,7 @@
"hz":0.0, "hz":0.0,
"counter":0, "counter":0,
"roughness":0.0 "roughness":0.0
}, },
"low_priority_reads":{ // measures number of incoming low priority read requests "low_priority_reads":{ // measures number of incoming low priority read requests
"hz":0.0, "hz":0.0,
"counter":0, "counter":0,
@ -702,7 +702,8 @@
"auto_resolvers":1, "auto_resolvers":1,
"auto_logs":3, "auto_logs":3,
"backup_worker_enabled":1, "backup_worker_enabled":1,
"commit_proxies":5 // this field will be absent if a value has not been explicitly set "commit_proxies":5, // this field will be absent if a value has not been explicitly set
"proxies":6 // this field will be absent if a value has not been explicitly set
}, },
"data":{ "data":{
"least_operating_space_bytes_log_server":0, "least_operating_space_bytes_log_server":0,

15
fdbclient/DatabaseConfiguration.cpp

@ -338,14 +338,26 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
result["regions"] = getRegionJSON(); result["regions"] = getRegionJSON();
} }
// Add to the `proxies` count for backwards compatibility with tools built before 7.0.
int32_t proxyCount = -1;
if (desiredTLogCount != -1 || isOverridden("logs")) { if (desiredTLogCount != -1 || isOverridden("logs")) {
result["logs"] = desiredTLogCount; result["logs"] = desiredTLogCount;
} }
if (commitProxyCount != -1 || isOverridden("commit_proxies")) { if (commitProxyCount != -1 || isOverridden("commit_proxies")) {
result["commit_proxies"] = commitProxyCount; result["commit_proxies"] = commitProxyCount;
if (proxyCount != -1) {
proxyCount += commitProxyCount;
} else {
proxyCount = commitProxyCount;
}
} }
if (grvProxyCount != -1 || isOverridden("grv_proxies")) { if (grvProxyCount != -1 || isOverridden("grv_proxies")) {
result["grv_proxies"] = grvProxyCount; result["grv_proxies"] = grvProxyCount;
if (proxyCount != -1) {
proxyCount += grvProxyCount;
} else {
proxyCount = grvProxyCount;
}
} }
if (resolverCount != -1 || isOverridden("resolvers")) { if (resolverCount != -1 || isOverridden("resolvers")) {
result["resolvers"] = resolverCount; result["resolvers"] = resolverCount;
@ -371,6 +383,9 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
if (autoDesiredTLogCount != CLIENT_KNOBS->DEFAULT_AUTO_LOGS || isOverridden("auto_logs")) { if (autoDesiredTLogCount != CLIENT_KNOBS->DEFAULT_AUTO_LOGS || isOverridden("auto_logs")) {
result["auto_logs"] = autoDesiredTLogCount; result["auto_logs"] = autoDesiredTLogCount;
} }
if (proxyCount != -1) {
result["proxies"] = proxyCount;
}
result["backup_worker_enabled"] = (int32_t)backupWorkerEnabled; result["backup_worker_enabled"] = (int32_t)backupWorkerEnabled;
result["perpetual_storage_wiggle"] = perpetualStorageWiggleSpeed; result["perpetual_storage_wiggle"] = perpetualStorageWiggleSpeed;

1
fdbclient/Schemas.cpp

@ -755,6 +755,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
"auto_logs":3, "auto_logs":3,
"commit_proxies":5, "commit_proxies":5,
"grv_proxies":1, "grv_proxies":1,
"proxies":6,
"backup_worker_enabled":1, "backup_worker_enabled":1,
"perpetual_storage_wiggle":0 "perpetual_storage_wiggle":0
}, },