SERVER-23260 Report original query with getMore

1 files changed, 14 insertions, 0 deletions

diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index e3906d29de9..9562f3dff0e 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -346,6 +346,10 @@ void CurOp::reportState(BSONObjBuilder* builder) {
         appendAsObjOrString("query", _query, maxQuerySize, builder);
     }
 
+    if (!_originatingCommand.isEmpty()) {
+        appendAsObjOrString("originatingCommand", _originatingCommand, maxQuerySize, builder);
+    }
+
     if (!_planSummary.empty()) {
         builder->append("planSummary", _planSummary);
     }
@@ -415,6 +419,11 @@ string OpDebug::report(const CurOp& curop, const SingleThreadedLockStats& lockSt
         }
     }
 
+    auto originatingCommand = curop.originatingCommand();
+    if (!originatingCommand.isEmpty()) {
+        s << " originatingCommand: " << originatingCommand;
+    }
+
     if (!curop.getPlanSummary().empty()) {
         s << " planSummary: " << curop.getPlanSummary();
     }
@@ -516,6 +525,11 @@ void OpDebug::append(const CurOp& curop,
         appendAsObjOrString(fieldName, curop.query(), maxElementSize, &b);
     }
 
+    auto originatingCommand = curop.originatingCommand();
+    if (!originatingCommand.isEmpty()) {
+        appendAsObjOrString("originatingCommand", originatingCommand, maxElementSize, &b);
+    }
+
     if (!updateobj.isEmpty()) {
         appendAsObjOrString("updateobj", updateobj, maxElementSize, &b);
     }