summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristina <kristina@10gen.com>2012-01-31 10:32:34 -0500
committerKristina <kristina@10gen.com>2012-01-31 10:32:54 -0500
commit7cb8cf6c3459bfda29eeae840aee708ceea22ed5 (patch)
tree8dbe226a7aef3a4c9e0f56f63257e7421f8610ee
parent6a5269e37025ab957320a51717787187b1040bde (diff)
downloadmongo-7cb8cf6c3459bfda29eeae840aee708ceea22ed5.tar.gz
Don't switch back to LOADINGCONFIG after entering EMPTYCONFIG state SERVER-4825
-rw-r--r--src/mongo/db/repl/rs.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/repl/rs.cpp b/src/mongo/db/repl/rs.cpp
index 7f0f905d904..95e526f763c 100644
--- a/src/mongo/db/repl/rs.cpp
+++ b/src/mongo/db/repl/rs.cpp
@@ -594,10 +594,11 @@ namespace mongo {
}
void ReplSetImpl::loadConfig() {
+ startupStatus = LOADINGCONFIG;
+ startupStatusMsg.set("loading " + rsConfigNs + " config (LOADINGCONFIG)");
+ LOG(1) << "loadConfig() " << rsConfigNs << endl;
+
while( 1 ) {
- startupStatus = LOADINGCONFIG;
- startupStatusMsg.set("loading " + rsConfigNs + " config (LOADINGCONFIG)");
- LOG(1) << "loadConfig() " << rsConfigNs << endl;
try {
vector<ReplSetConfig> configs;
try {