1 files changed, 62 insertions, 0 deletions
diff --git a/jstests/noPassthrough/non_atomic_apply_ops_logging.js b/jstests/noPassthrough/non_atomic_apply_ops_logging.js
new file mode 100644
index 00000000000..f93e9d38189
--- /dev/null
+++ b/jstests/noPassthrough/non_atomic_apply_ops_logging.js
@@ -0,0 +1,62 @@
+// SERVER-28594 Ensure non-atomic ops are individually logged in applyOps
+// and atomic ops are collectively logged in applyOps.
+(function() {
+    "use strict";
+
+    let rst = new ReplSetTest({nodes: 1});
+    rst.startSet();
+    rst.initiate();
+
+    let primary = rst.getPrimary();
+    let testDB = primary.getDB("test");
+    let oplogColl = primary.getDB("local").oplog.rs;
+    let testCollName = "testColl";
+    let rerenamedCollName = "rerenamedColl";
+
+    testDB.runCommand({drop: testCollName});
+    testDB.runCommand({drop: rerenamedCollName});
+    assert.commandWorked(testDB.runCommand({create: testCollName}));
+    let testColl = testDB[testCollName];
+
+    // Ensure atomic apply ops logging only produces one oplog entry
+    // per call to apply ops and does not log individual operations
+    // separately.
+    assert.commandWorked(testDB.runCommand({
+        applyOps: [
+            {op: "i", ns: testColl.getFullName(), o: {_id: 1, a: "foo"}},
+            {op: "i", ns: testColl.getFullName(), o: {_id: 2, a: "bar"}}
+        ]
+    }));
+    assert.eq(oplogColl.find({"o.applyOps": {"$exists": true}}).count(), 1);
+    assert.eq(oplogColl.find({"op": "i"}).count(), 0);
+    // Ensure non-atomic apply ops logging produces an oplog entry for
+    // each operation in the apply ops call and no record of applyOps
+    // appears for these operations.
+    assert.commandWorked(testDB.runCommand({
+        applyOps: [
+            {
+              op: "c",
+              ns: "test.$cmd",
+              o: {
+                  renameCollection: "test.testColl",
+                  to: "test.renamedColl",
+                  stayTemp: false,
+                  dropTarget: false
+              }
+            },
+            {
+              op: "c",
+              ns: "test.$cmd",
+              o: {
+                  renameCollection: "test.renamedColl",
+                  to: "test." + rerenamedCollName,
+                  stayTemp: false,
+                  dropTarget: false
+              }
+            }
+        ]
+    }));
+    assert.eq(oplogColl.find({"o.renameCollection": {"$exists": true}}).count(), 2);
+    assert.eq(oplogColl.find({"o.applyOps": {"$exists": true}}).count(), 1);
+    rst.stopSet();
+})();