summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordwight <dwight@10gen.com>2010-08-12 11:28:27 -0400
committerEliot Horowitz <eliot@10gen.com>2010-09-15 15:01:18 -0400
commitf6c66f106cfb8fee5907d0aa7f0316be2966de52 (patch)
treefd9703984a3b0d5916197ac03986d82b1c1c18a5
parentcfeb9c90fd34ce92f8e054245825aacf10b3c20f (diff)
downloadmongo-f6c66f106cfb8fee5907d0aa7f0316be2966de52.tar.gz
minor help text
-rw-r--r--db/repl/rs.h2
-rw-r--r--jstests/replsets/replset5.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/db/repl/rs.h b/db/repl/rs.h
index ed88c227d18..6c4d9a83f9a 100644
--- a/db/repl/rs.h
+++ b/db/repl/rs.h
@@ -405,6 +405,8 @@ namespace mongo {
if( theReplSet == 0 ) {
result.append("startupStatus", ReplSet::startupStatus);
errmsg = ReplSet::startupStatusMsg.empty() ? "replset unknown error 2" : ReplSet::startupStatusMsg;
+ if( ReplSet::startupStatus == 3 )
+ result.append("info", "run rs.initiate(...) if not yet done for the set");
return false;
}
return true;
diff --git a/jstests/replsets/replset5.js b/jstests/replsets/replset5.js
index aa95484c227..fe1761e129f 100644
--- a/jstests/replsets/replset5.js
+++ b/jstests/replsets/replset5.js
@@ -1,3 +1,5 @@
+// rs test getlasterrordefaults
+
doTest = function (signal) {
// Test getLastError defaults
@@ -21,7 +23,6 @@ doTest = function (signal) {
master.getDB("barDB").bar.save({ a: 1 });
replTest.awaitReplication();
-
// These writes should be replicated immediately
master.getDB(testDB).foo.insert({ n: 1 });
master.getDB(testDB).foo.insert({ n: 2 });