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

Merge branch 'release-6.2' of github.com:apple/foundationdb into feature-ha-fixes 

# Conflicts:
#	documentation/sphinx/source/mr-status-json-schemas.rst.inc
#	documentation/sphinx/source/mr-status.rst
#	fdbclient/Schemas.cpp
This commit is contained in:
Evan Tschannen 2020-07-10 10:37:43 -07:00
parent 05de7c8e9d 2f22ce1677
commit 4492a50e72
5 changed files with 5 additions and 5 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

@ -402,7 +402,7 @@
"consistencycheck_suspendkey_fetch_timeout",
"consistencycheck_disabled",
"primary_dc_missing",
"fetch_primary_dc_timedout"
"fetch_primary_dc_timeout"
]
},
"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 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_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 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>

2
fdbclient/Schemas.cpp
View File

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

2
fdbserver/Knobs.cpp
View File

@ -538,7 +538,7 @@ ServerKnobs::ServerKnobs(bool randomize, ClientKnobs* clientKnobs, bool isSimula
init( TIME_KEEPER_MAX_ENTRIES, 3600 * 24 * 30 * 6 ); if( randomize && BUGGIFY ) { TIME_KEEPER_MAX_ENTRIES = 2; }
// Server request latency measurement
init( LATENCY_SAMPLE_SIZE, 10000 );
init( LATENCY_SAMPLE_SIZE, 100000 );
init( LATENCY_METRICS_LOGGING_INTERVAL, 60.0 );
// clang-format on

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));