SERVER-42888 Fix deprecate CodeWScope log message frequency

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index 75dde5374ad..1d7400a634b 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -96,6 +96,9 @@ namespace mr {
 namespace {
 
 Rarely mapParamsDeprecationSampler;  // Used to occasionally log deprecation messages.
+// Used to log occassional deprecation warnings when CodeWScope is used in MapReduce.
+Rarely mapReduceCodeWScopeSampler;
+
 
 /**
  * Runs a count against the namespace specified by 'ns'. If the caller holds the global write lock,
@@ -232,8 +235,8 @@ JSFunction::JSFunction(const std::string& type, const BSONElement& e) {
     _code = e._asCode();
 
     if (e.type() == CodeWScope) {
-        if (_sampler.tick())
-            warning() << "Use of CodeWScope with MapReduce is deprecated. Prefer putting all scope "
+        if (mapReduceCodeWScopeSampler.tick())
+            warning() << "Use of CodeWScope with MapReduce is deprecated. Put all scope "
                          "variables in the scope parameter of the MapReduce command";
         _wantedScope = e.codeWScopeObject();
     }
diff --git a/src/mongo/db/commands/mr.h b/src/mongo/db/commands/mr.h
index 70cdaebcbd5..03ceeab900e 100644
--- a/src/mongo/db/commands/mr.h
+++ b/src/mongo/db/commands/mr.h
@@ -130,8 +130,6 @@ private:
     std::string _type;
     std::string _code;     // actual javascript code
     BSONObj _wantedScope;  // this is for CodeWScope
-    // Used to log occassional deprecation warnings when CodeWScope is used in MapReduce.
-    Rarely _sampler;
 
     Scope* _scope;  // this is not owned by us, and might be shared
     ScriptingFunction _func;