1 files changed, 41 insertions, 0 deletions
diff --git a/jstests/noPassthroughWithMongod/datasize_kill_op.js b/jstests/noPassthroughWithMongod/datasize_kill_op.js
new file mode 100644
index 00000000000..e034aa630ed
--- /dev/null
+++ b/jstests/noPassthroughWithMongod/datasize_kill_op.js
@@ -0,0 +1,41 @@
+// Test that the dataSize command can be interrupted. Failpoint is defined for mongod only,
+// therefore this test is running only in unsharded setup.
+
+(function() {
+"use strict";
+
+load("jstests/libs/fail_point_util.js");         // For configureFailPoint.
+load("jstests/libs/wait_for_command.js");        // For waitForCommand.
+load("jstests/libs/parallel_shell_helpers.js");  // For funWithArgs.
+
+const coll = db.foo;
+coll.drop();
+coll.insert({_id: 0, s: "asdasdasdasdasdasdasd"});
+
+const dataSizeCommand = {
+    "dataSize": "test.foo",
+    "keyPattern": {"_id": 1},
+    "min": {"_id": 0},
+    "max": {"_id": 1}
+};
+
+// Configure the failpoint.
+const failpoint = configureFailPoint(db, "hangBeforeDatasizeCount");
+
+// Launch a parallel shell that runs the dataSize command, that should fail due to interrupt.
+const awaitShell =
+    startParallelShell(funWithArgs(function(cmd) {
+                           assert.commandFailedWithCode(db.runCommand(cmd), ErrorCodes.Interrupted);
+                       }, dataSizeCommand), db.getMongo().port);
+failpoint.wait();
+
+// Find the command opid and kill it.
+const opId = waitForCommand("dataSizeCmd", op => (op["command"]["dataSize"] == "test.foo"), db);
+assert.commandWorked(db.killOp(opId));
+
+// The command is not killed just yet. It will be killed, after releasing the failpoint.
+assert.neq(waitForCommand("dataSizeCmd", op => (op["command"]["dataSize"] == "test.foo"), db), -1);
+
+failpoint.off();
+awaitShell();
+})();