diff options
Diffstat (limited to 'src/mongo/db/repl/master_slave.cpp')
| -rw-r--r-- | src/mongo/db/repl/master_slave.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp index 1567d6dc603..da01612154e 100644 --- a/src/mongo/db/repl/master_slave.cpp +++ b/src/mongo/db/repl/master_slave.cpp @@ -646,7 +646,7 @@ void ReplSource::applyCommand(OperationContext* opCtx, const BSONObj& op) { try { Status status = applyCommand_inlock(opCtx, op, true); uassert(28639, "Failure applying initial sync command", status.isOK()); - } catch (UserException& e) { + } catch (AssertionException& e) { log() << "sync: caught user assertion " << redact(e) << " while applying op: " << redact(op) << endl; ; @@ -673,7 +673,7 @@ void ReplSource::applyOperation(OperationContext* opCtx, Database* db, const BSO sync.setHostname(hostName); sync.fetchAndInsertMissingDocument(opCtx, op); } - } catch (UserException& e) { + } catch (AssertionException& e) { log() << "sync: caught user assertion " << redact(e) << " while applying op: " << redact(op) << endl; ; @@ -1209,14 +1209,6 @@ int _replMain(OperationContext* opCtx, ReplSource::SourceVector& sources, int& n } catch (const SyncException&) { log() << "caught SyncException" << endl; return 10; - } catch (AssertionException& e) { - if (e.severe()) { - log() << "replMain AssertionException " << redact(e) << endl; - return 60; - } else { - log() << "AssertionException " << redact(e) << endl; - } - replInfo = "replMain caught AssertionException"; } catch (const DBException& e) { log() << "DBException " << redact(e) << endl; replInfo = "replMain caught DBException"; |