SERVER-32913 applyOps containing malformed operations cannot run atomically

1 files changed, 9 insertions, 4 deletions

diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp
index c0c49fe68c3..42e857b0e74 100644
--- a/src/mongo/db/repl/apply_ops.cpp
+++ b/src/mongo/db/repl/apply_ops.cpp
@@ -162,11 +162,16 @@ Status _applyOps(OperationContext* opCtx,
                         << redact(opObj));
             }
 
-            // Cannot specify timestamp values in an atomic applyOps.
-            if (opObj.hasField("ts")) {
+            // Reject malformed operations in an atomic applyOps.
+            try {
+                ReplOperation::parse(IDLParserErrorContext("applyOps"), opObj);
+            } catch (...) {
                 uasserted(ErrorCodes::AtomicityFailure,
-                          "cannot apply an op with a timestamp in atomic applyOps mode; "
-                          "will retry without atomicity");
+                          str::stream()
+                              << "cannot apply a malformed operation in atomic applyOps mode: "
+                              << redact(opObj)
+                              << "; will retry without atomicity: "
+                              << exceptionToStatus().toString());
             }
 
             OldClientContext ctx(opCtx, nss.ns());