SERVER-24462 Record stats for the "top" command in findAndModify.

3 files changed, 64 insertions, 16 deletions

diff --git a/jstests/core/operation_latency_histogram.js b/jstests/core/operation_latency_histogram.js
index 5c30f6f5601..fd2849d2b6b 100644
--- a/jstests/core/operation_latency_histogram.js
+++ b/jstests/core/operation_latency_histogram.js
@@ -118,8 +118,7 @@
 
     // FindAndModify
     testColl.findAndModify({query: {}, update: {pt: {type: "Point", coordinates: [0, 0]}}});
-    // TODO SERVER-24462: findAndModify is not currently counted in Top.
-    lastHistogram = checkHistogramDiff(0, 0, 0);
+    lastHistogram = checkHistogramDiff(0, 1, 0);
 
     // CreateIndex
     assert.commandWorked(testColl.createIndex({pt: "2dsphere"}));
diff --git a/jstests/core/top.js b/jstests/core/top.js
index 1aff2a4136b..7282f10fb51 100644
--- a/jstests/core/top.js
+++ b/jstests/core/top.js
@@ -6,11 +6,10 @@ var name = "toptest";
 
 var testDB = db.getSiblingDB(name);
 var testColl = testDB[name + "coll"];
-
-//  Ensure an empty collection exists for first top command
 testColl.drop();
-testColl.insert({x: 0});
-testColl.remove({x: 0});
+
+// Perform an operation on the collection so that it is present in the "top" command's output.
+assert.eq(testColl.find({}).itcount(), 0);
 
 // get top statistics for the test collection
 function getTop() {
@@ -23,7 +22,7 @@ var lastTop = getTop();
 //  return the number of operations since the last call to diffTop for the specified key
 function diffTop(key) {
     var thisTop = getTop();
-    difference = {
+    var difference = {
         time: thisTop[key].time - lastTop[key].time,
         count: thisTop[key].count - lastTop[key].count
     };
@@ -33,7 +32,7 @@ function diffTop(key) {
     assert.gte(difference.time, 0, "non-decreasing time");
 
     //  Time should advance iff operations were performed
-    assert.eq(difference.count != 0, difference.time > 0, "non-zero time iff non-zero count");
+    assert.eq(difference.count !== 0, difference.time > 0, "non-zero time iff non-zero count");
     return difference;
 }
 
@@ -48,15 +47,15 @@ function checkStats(key, expected) {
 }
 
 //  Insert
-for (i = 0; i < numRecords; i++) {
-    testColl.insert({_id: i});
+for (var i = 0; i < numRecords; i++) {
+    assert.writeOK(testColl.insert({_id: i}));
 }
 checkStats("insert", numRecords);
 checkStats("writeLock", numRecords);
 
 // Update
 for (i = 0; i < numRecords; i++) {
-    testColl.update({_id: i}, {x: i});
+    assert.writeOK(testColl.update({_id: i}, {x: i}));
 }
 checkStats("update", numRecords);
 
@@ -79,25 +78,52 @@ checkStats("getmore", numRecords);
 
 // Remove
 for (i = 0; i < numRecords; i++) {
-    testColl.remove({_id: 1});
+    assert.writeOK(testColl.remove({_id: 1}));
 }
 checkStats("remove", numRecords);
 
 // Upsert, note that these are counted as updates, not inserts
 for (i = 0; i < numRecords; i++) {
-    testColl.update({_id: i}, {x: i}, {upsert: 1});
+    assert.writeOK(testColl.update({_id: i}, {x: i}, {upsert: 1}));
 }
 checkStats("update", numRecords);
 
 // Commands
+var res;
+
+// "count" command
 diffTop("commands");  // ignore any commands before this
 for (i = 0; i < numRecords; i++) {
-    assert.eq(testDB.runCommand({count: "toptestcoll"}).n, numRecords);
+    res = assert.commandWorked(testDB.runCommand({count: testColl.getName()}));
+    assert.eq(res.n, numRecords, tojson(res));
+}
+checkStats("commands", numRecords);
+
+// "findAndModify" command
+diffTop("commands");
+for (i = 0; i < numRecords; i++) {
+    res = assert.commandWorked(testDB.runCommand({
+        findAndModify: testColl.getName(),
+        query: {_id: i},
+        update: {$inc: {x: 1}},
+    }));
+    assert.eq(res.value.x, i, tojson(res));
+}
+checkStats("commands", numRecords);
+
+diffTop("commands");
+for (i = 0; i < numRecords; i++) {
+    res = assert.commandWorked(testDB.runCommand({
+        findAndModify: testColl.getName(),
+        query: {_id: i},
+        remove: true,
+    }));
+    assert.eq(res.value.x, i + 1, tojson(res));
 }
 checkStats("commands", numRecords);
 
-for (key in lastTop) {
-    if (!(key in checked)) {
+for (var key of Object.keys(lastTop)) {
+    if (!checked.hasOwnProperty(key)) {
         printjson({key: key, stats: diffTop(key)});
     }
 }
diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
index 6d28c2eabe9..0619c8e91c3 100644
--- a/src/mongo/db/commands/find_and_modify.cpp
+++ b/src/mongo/db/commands/find_and_modify.cpp
@@ -63,6 +63,7 @@
 #include "mongo/db/repl/repl_client_info.h"
 #include "mongo/db/repl/replication_coordinator_global.h"
 #include "mongo/db/s/collection_sharding_state.h"
+#include "mongo/db/stats/top.h"
 #include "mongo/db/write_concern.h"
 #include "mongo/util/log.h"
 #include "mongo/util/scopeguard.h"
@@ -200,6 +201,20 @@ Status checkCanAcceptWritesForDatabase(const NamespaceString& nsString) {
     return Status::OK();
 }
 
+void recordStatsForTopCommand(OperationContext* txn) {
+    auto curOp = CurOp::get(txn);
+    const int writeLocked = 1;
+
+    Top::get(txn->getClient()->getServiceContext())
+        .record(txn,
+                curOp->getNS(),
+                curOp->getLogicalOp(),
+                writeLocked,
+                curOp->elapsedMicros(),
+                curOp->isCommand(),
+                curOp->getReadWriteType());
+}
+
 }  // namespace
 
 /* Find and Modify an object returning either the old (default) or new value*/
@@ -416,6 +431,9 @@ public:
                 if (!advanceStatus.isOK()) {
                     return appendCommandStatus(result, advanceStatus.getStatus());
                 }
+                // Nothing after advancing the plan executor should throw a WriteConflictException,
+                // so the following bookkeeping with execution stats won't end up being done
+                // multiple times.
 
                 PlanSummaryStats summaryStats;
                 Explain::getSummaryStats(*exec, &summaryStats);
@@ -432,6 +450,7 @@ public:
                     Explain::getWinningPlanStats(exec.get(), &execStatsBob);
                     curOp->debug().execStats = execStatsBob.obj();
                 }
+                recordStatsForTopCommand(txn);
 
                 boost::optional<BSONObj> value = advanceStatus.getValue();
                 appendCommandResponse(exec.get(), args.isRemove(), value, result);
@@ -513,6 +532,9 @@ public:
                 if (!advanceStatus.isOK()) {
                     return appendCommandStatus(result, advanceStatus.getStatus());
                 }
+                // Nothing after advancing the plan executor should throw a WriteConflictException,
+                // so the following bookkeeping with execution stats won't end up being done
+                // multiple times.
 
                 PlanSummaryStats summaryStats;
                 Explain::getSummaryStats(*exec, &summaryStats);
@@ -527,6 +549,7 @@ public:
                     Explain::getWinningPlanStats(exec.get(), &execStatsBob);
                     curOp->debug().execStats = execStatsBob.obj();
                 }
+                recordStatsForTopCommand(txn);
 
                 boost::optional<BSONObj> value = advanceStatus.getValue();
                 appendCommandResponse(exec.get(), args.isRemove(), value, result);