summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2014-04-18 08:41:03 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2014-04-18 08:41:03 -0400
commit4a3e38949aa6bfe86bb7a56f7b5536cb25a54a33 (patch)
tree01b4ee82de43ed101411ba6c2c300ed04363693b
parent52faaa32ef9226cf6583e82d97caa40c46dade80 (diff)
downloadmongo-4a3e38949aa6bfe86bb7a56f7b5536cb25a54a33.tar.gz
Revert "SERVER-13601 assert upon failing to run a replicated command"
This reverts commit ea2102c1946506a888707aec06995c1c736075d6.
-rw-r--r--src/mongo/db/repl/oplog.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 5ec26d17fea..32a4cccd8bf 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -656,22 +656,8 @@ namespace mongo {
else if ( *opType == 'c' ) {
BufBuilder bb;
BSONObjBuilder ob;
+ _runCommands(ns, o, bb, ob, true, 0);
// _runCommands takes care of adjusting opcounters for command counting.
- if (!_runCommands(ns, o, bb, ob, true, 0)) {
- // command failed to run
- severe() << "failed to run replicated command during replication: "
- << o.toString();
- fassertFailedNoTrace(17442);
- }
- Status cmdStatus = Command::getStatusFromCommandResult(ob.asTempObj());
- if (!cmdStatus.isOK()) {
- // command hit an error of some sort
- severe() << "failed to run replicated command during replication "
- << causedBy(cmdStatus)
- << ": "
- << o.toString();
- fassertFailedNoTrace(17443);
- }
}
else if ( *opType == 'n' ) {
// no op