SERVER-13601 assert upon failing to run a replicated command

1 files changed, 15 insertions, 1 deletions

diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index f39dc181881..c9912315a4a 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -656,8 +656,22 @@ 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