diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-28 20:34:31 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-28 20:34:31 -0400 |
| commit | 73f4e5dceae76e4513128b186982f108a5ffea6c (patch) | |
| tree | 016ace270bb02e861d8e9122f4ae4667e6a729e7 /src | |
| parent | df128f1328ce12ac098aecafa43cb5e0eda6d3e0 (diff) | |
| download | mongo-73f4e5dceae76e4513128b186982f108a5ffea6c.tar.gz | |
Revert "SERVER-15767 Refuse to start up with invalid locally stored rs config"
This reverts commit 33d59e5d8cded2e0eab2b9e370727eac5e4d020c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/repl/repl_coordinator_impl.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/mongo/db/repl/repl_coordinator_impl.cpp b/src/mongo/db/repl/repl_coordinator_impl.cpp index f4ab9f7b096..0f832047b4c 100644 --- a/src/mongo/db/repl/repl_coordinator_impl.cpp +++ b/src/mongo/db/repl/repl_coordinator_impl.cpp @@ -191,11 +191,10 @@ namespace { ReplicaSetConfig localConfig; Status status = localConfig.initialize(cfg.getValue()); if (!status.isOK()) { - error() << "Locally stored replica set configuration does not parse; See " - "http://www.mongodb.org/dochub/core/recover-replica-set-from-invalid-config " - "for information on how to recover from this. Got \"" << - status << "\" while parsing " << cfg.getValue(); - fassertFailedNoTrace(28542); + warning() << "Locally stored replica set configuration does not parse; " + "waiting for rsInitiate or remote heartbeat; Got " << status << " while parsing " << + cfg.getValue(); + return true; } StatusWith<OpTime> lastOpTimeStatus = _externalState->loadLastOpTime(txn); @@ -233,20 +232,10 @@ namespace { _rsConfig, localConfig); if (!myIndex.isOK()) { - if (myIndex.getStatus() == ErrorCodes::NodeNotFound || - myIndex.getStatus() == ErrorCodes::DuplicateKey) { - warning() << "Locally stored replica set configuration does not have a valid entry " - "for the current node; waiting for reconfig or remote heartbeat; Got \"" << - myIndex.getStatus() << "\" while validating " << localConfig.toBSON(); - myIndex = StatusWith<int>(-1); - } - else { - error() << "Locally stored replica set configuration is invalid; See " - "http://www.mongodb.org/dochub/core/recover-replica-set-from-invalid-config" - " for information on how to recover from this. Got \"" << - myIndex.getStatus() << "\" while validating " << localConfig.toBSON(); - fassertFailedNoTrace(28541); - } + warning() << "Locally stored replica set configuration not valid for current node; " + "waiting for reconfig or remote heartbeat; Got " << myIndex.getStatus() << + " while validating " << localConfig.toBSON(); + myIndex = StatusWith<int>(-1); } if (localConfig.getReplSetName() != _settings.ourSetName()) { |