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

Consistently use timeout instead of timedout in status messages.

This commit is contained in:
A.J. Beamon 2020-04-07 08:43:23 -07:00
parent 9b8a642e24
commit 2309e9f156
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,7 +369,7 @@
"consistencycheck_suspendkey_fetch_timeout", "consistencycheck_suspendkey_fetch_timeout",
"consistencycheck_disabled", "consistencycheck_disabled",
"primary_dc_missing", "primary_dc_missing",
"fetch_primary_dc_timedout" "fetch_primary_dc_timeout"
] ]
}, },
"issues":[ "issues":[

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

@ -89,7 +89,7 @@ cluster.messages unreachable_processes The
cluster.messages unreadable_configuration Unable to read database configuration. 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 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 primary_dc_missing Unable to determine primary datacenter.
cluster.messages fetch_primary_dc_timedout Fetching primary DC timed out. 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 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 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> cluster.processes.<process>.messages io_error <error> occured in <subsystem>

2
fdbclient/Schemas.cpp
View File

@ -400,7 +400,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
"duplicate_mutation_streams", "duplicate_mutation_streams",
"duplicate_mutation_fetch_timeout", "duplicate_mutation_fetch_timeout",
"primary_dc_missing", "primary_dc_missing",
"fetch_primary_dc_timedout" "fetch_primary_dc_timeout"
] ]
}, },
"issues":[ "issues":[

2
fdbserver/Status.actor.cpp
View File

@ -2170,7 +2170,7 @@ ACTOR Future<Optional<Value>> getActivePrimaryDC(Database cx, JsonBuilderArray*
} catch (Error& e) { } catch (Error& e) {
if (e.code() == error_code_timed_out) { if (e.code() == error_code_timed_out) {
messages->push_back( 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>(); return Optional<Value>();
} else { } else {
wait(tr.onError(e)); wait(tr.onError(e));