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

Address review comments.

This commit is contained in:
Balachandar Namasivayam 2018-06-12 11:59:47 -07:00
parent 7db928ccec
commit 819929e1be
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ The following format informally describes the JSON containing the status data. T
"name": < "incorrect_cluster_file_contents"
| ...
>,
"description": "Cluster file contents do not match current cluster connection string. Verify cluster file and its parent directory is writable and has not been overwritten externally."
"description": "Cluster file contents do not match current cluster connection string. Verify the cluster file and its parent directory are writable and that the cluster file has not been overwritten externally."
}
],
"reasons": [

2
fdbclient/StatusClient.actor.cpp
View File

@ -325,7 +325,7 @@ ACTOR Future<StatusObject> clientStatusFetcher(Reference<ClusterConnectionFile>
description += ClusterConnectionFile(f->getFilename()).getConnectionString().toString().c_str();
description += "\nThe current connection string is: ";
description += f->getConnectionString().toString().c_str();
description += "\nVerify cluster file and its parent directory is writable and has not been overwritten externally. To change coordinators without manual intervention, the cluster file and its containing folder must be writable by all servers and clients. If a majority of the coordinators referenced by the old connection string are lost, the database will stop working until the correct cluster file is distributed to all processes.";
description += "\nVerify the cluster file and its parent directory are writable and that the cluster file has not been overwritten externally. To change coordinators without manual intervention, the cluster file and its containing folder must be writable by all servers and clients. If a majority of the coordinators referenced by the old connection string are lost, the database will stop working until the correct cluster file is distributed to all processes.";
messages->push_back(makeMessage("incorrect_cluster_file_contents", description.c_str()));
}

2
fdbserver/Status.actor.cpp
View File

@ -1558,7 +1558,7 @@ static StatusObject faultToleranceStatusFetcher(DatabaseConfiguration configurat
static std::string getIssueDescription(std::string name) {
if(name == "incorrect_cluster_file_contents") {
return "Cluster file contents do not match current cluster connection string. Verify cluster file and its parent directory is writable and has not been overwritten externally.";
return "Cluster file contents do not match current cluster connection string. Verify the cluster file and its parent directory are writable and that the cluster file has not been overwritten externally.";
}
// FIXME: name and description will be the same unless the message is 'incorrect_cluster_file_contents', which is currently the only possible message