diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc index cfd473676c..c4221a4889 100644 --- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc +++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc @@ -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":[ diff --git a/documentation/sphinx/source/mr-status.rst b/documentation/sphinx/source/mr-status.rst index 9e11906e71..6ba4537285 100644 --- a/documentation/sphinx/source/mr-status.rst +++ b/documentation/sphinx/source/mr-status.rst @@ -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..messages file_open_error Unable to open ‘’ (). cluster.processes..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..messages io_error occured in diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp index 3a1ded221b..ca5f408d9f 100644 --- a/fdbclient/Schemas.cpp +++ b/fdbclient/Schemas.cpp @@ -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":[ diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp index 44c6191913..ecc50ad1fa 100644 --- a/fdbserver/Status.actor.cpp +++ b/fdbserver/Status.actor.cpp @@ -2199,7 +2199,7 @@ ACTOR Future> 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(); } else { wait(tr.onError(e));