SERVER-75265 Improve queryable encryption handling in curop

1 files changed, 9 insertions, 6 deletions

diff --git a/src/mongo/s/query/cluster_aggregate.cpp b/src/mongo/s/query/cluster_aggregate.cpp
index 11959054983..6130a80c1fa 100644
--- a/src/mongo/s/query/cluster_aggregate.cpp
+++ b/src/mongo/s/query/cluster_aggregate.cpp
@@ -410,12 +410,15 @@ Status ClusterAggregate::runAggregate(OperationContext* opCtx,
         // If the aggregate command supports encrypted collections, do rewrites of the pipeline to
         // support querying against encrypted fields.
         if (shouldDoFLERewrite) {
-            // After this rewriting, the encryption info does not need to be kept around.
-            pipeline = processFLEPipelineS(opCtx,
-                                           namespaces.executionNss,
-                                           request.getEncryptionInformation().value(),
-                                           std::move(pipeline));
-            request.setEncryptionInformation(boost::none);
+            if (!request.getEncryptionInformation()->getCrudProcessed().value_or(false)) {
+                pipeline = processFLEPipelineS(opCtx,
+                                               namespaces.executionNss,
+                                               request.getEncryptionInformation().value(),
+                                               std::move(pipeline));
+                request.getEncryptionInformation()->setCrudProcessed(true);
+            }
+
+            CurOp::get(opCtx)->debug().shouldOmitDiagnosticInformation = true;
         }
 
         pipeline->optimizePipeline();