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

Merge pull request #3481 from ajbeamon/fix-dc-timeout-message 

Add missing messages to schema and rename one to match later versions
This commit is contained in:
Evan Tschannen 2020-07-10 10:30:21 -07:00 committed by GitHub
parent 4562d20f81 b51beead53
commit 8befb0829d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
documentation/sphinx/source/mr-status-json-schemas.rst.inc
View File

@ -400,7 +400,9 @@
"layer_status_incomplete",
"database_availability_timeout",
"consistencycheck_suspendkey_fetch_timeout",
"consistencycheck_disabled"
"consistencycheck_disabled",
"primary_dc_missing",
"fetch_primary_dc_timeout"
]
},
"issues":[

2
documentation/sphinx/source/mr-status.rst
View File

@ -88,6 +88,8 @@ cluster.messages unreachable_ratekeeper_worker Unab
cluster.messages unreachable_processes The cluster has some unreachable processes.
cluster.messages unreadable_configuration Unable to read database configuration.
cluster.messages layer_status_incomplete Some or all of the layers subdocument could not be read.
cluster.messages primary_dc_missing Unable to determine primary datacenter.
cluster.messages fetch_primary_dc_timeout Fetching primary DC timed out.
cluster.processes.<process>.messages file_open_error Unable to open ‘<file>’ (<os_error>).
cluster.processes.<process>.messages incorrect_cluster_file_contents Cluster file contents do not match current cluster connection string. Verify cluster file is writable and has not been overwritten externally.
cluster.processes.<process>.messages io_error <error> occured in <subsystem>

4
fdbclient/Schemas.cpp
View File

@ -425,7 +425,9 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
"consistencycheck_suspendkey_fetch_timeout",
"consistencycheck_disabled",
"duplicate_mutation_streams",
"duplicate_mutation_fetch_timeout"
"duplicate_mutation_fetch_timeout",
"primary_dc_missing",
"fetch_primary_dc_timeout"
]
},
"issues":[

2
fdbserver/Status.actor.cpp
View File

@ -2199,7 +2199,7 @@ ACTOR Future<Optional<Value>> getActivePrimaryDC(Database cx, JsonBuilderArray*
} catch (Error& e) {
if (e.code() == error_code_timed_out) {
messages->push_back(
JsonString::makeMessage("fetch_primary_dc_timedout", "Fetching primary DC timed out."));
JsonString::makeMessage("fetch_primary_dc_timeout", "Fetching primary DC timed out."));
return Optional<Value>();
} else {
wait(tr.onError(e));