SERVER-35181 Corrected function signatures for CpuProfilerCommand

Note that this also adds a RHEL 7.0 variant specifically for Dagger
and gperftools

3 files changed, 25 insertions, 6 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index ab689db4bde..a431b542040 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -10228,13 +10228,14 @@ buildvariants:
   - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough
 
-- name: enterprise-rhel-70-64-bit
+- &enterprise-rhel-70-64-bit-template
+  name: enterprise-rhel-70-64-bit
   display_name: "* Enterprise RHEL 7.0"
   modules:
   - enterprise
   run_on:
   - rhel70-small
-  expansions:
+  expansions: &enterprise-rhel-70-64-bit-expansions-template
     test_flags: --excludeWithAnyTags=requires_mmapv1
     push_path: linux
     push_bucket: downloads.10gen.com
@@ -10291,6 +10292,23 @@ buildvariants:
     - ubuntu1604-packer
   - name: push
 
+# This variant is to intentionally test uncommon features nightly
+- <<: *enterprise-rhel-70-64-bit-template
+  name: enterprise-rhel-70-64-bit-kitchen-sink
+  display_name: "~ Enterprise RHEL 7.0 (Dagger, gperftools)"
+  expansions:
+    <<: *enterprise-rhel-70-64-bit-expansions-template
+    compile_flags: --ssl --use-cpu-profiler MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars
+    additional_targets: dagger
+  tasks:
+  - name: compile_all_run_unittests_TG
+    distros:
+    - rhel70
+  - name: compile_benchmarks
+    distros:
+    - rhel70
+  - name: jsCore
+
 - name: ubuntu1604-debug
   display_name: "* Ubuntu 16.04 DEBUG"
   run_on:
@@ -10919,7 +10937,7 @@ buildvariants:
 
 
 - name: enterprise-ubuntu1604-64
-  display_name: Enterprise Ubuntu 16.04 (+Dagger)
+  display_name: Enterprise Ubuntu 16.04 (GCC 5.4)
   modules:
   - enterprise
   run_on:
@@ -10943,7 +10961,6 @@ buildvariants:
     gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
     tooltags: "-tags 'ssl sasl'"
     build_mongoreplay: true
-    additional_targets: dagger
   display_tasks:
   - *unittests
   tasks:
diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js
index 3f94ed4d176..d641b30531b 100644
--- a/jstests/core/views/views_all_commands.js
+++ b/jstests/core/views/views_all_commands.js
@@ -87,6 +87,8 @@
         _configsvrRemoveShardFromZone: {skip: isAnInternalCommand},
         _configsvrShardCollection: {skip: isAnInternalCommand},
         _configsvrUpdateZoneKeyRange: {skip: isAnInternalCommand},
+        _cpuProfilerStart: {skip: isAnInternalCommand},
+        _cpuProfilerStop: {skip: isAnInternalCommand},
         _flushDatabaseCacheUpdates: {skip: isUnrelated},
         _flushRoutingTableCacheUpdates: {skip: isUnrelated},
         _getNextSessionMods: {skip: isAnInternalCommand},
diff --git a/src/mongo/db/commands/cpuprofile.cpp b/src/mongo/db/commands/cpuprofile.cpp
index ffe9704fa8c..df7dbeb537e 100644
--- a/src/mongo/db/commands/cpuprofile.cpp
+++ b/src/mongo/db/commands/cpuprofile.cpp
@@ -71,7 +71,7 @@ namespace {
 class CpuProfilerCommand : public ErrmsgCommandDeprecated {
 public:
     CpuProfilerCommand(char const* name) : ErrmsgCommandDeprecated(name) {}
-    AllowedOnSecondary secondaryAllowed() const override {
+    AllowedOnSecondary secondaryAllowed(ServiceContext* context) const override {
         return AllowedOnSecondary::kAlways;
     }
     bool adminOnly() const override {
@@ -82,7 +82,7 @@ public:
     }
     void addRequiredPrivileges(const std::string& dbname,
                                const BSONObj& cmdObj,
-                               std::vector<Privilege>* out) override {
+                               std::vector<Privilege>* out) const override {
         ActionSet actions;
         actions.addAction(ActionType::cpuProfiler);
         out->push_back(Privilege(ResourcePattern::forClusterResource(), actions));