SERVER-23256 Make profiler tests run serially with fsyncLock tests.

Author: jameswahlin

jstests/core/apitest_db.js

@@ -130,22 +130,26 @@ dd("e");
  *  profile level
  */
 
-db.setProfilingLevel(0);
-assert(db.getProfilingLevel() == 0, "prof level 0");
+// A test-specific database is used for profiler testing so as not to interfere with other tests
+// that modify profiler level, when run in parallel.
+var profileLevelDB = db.getSiblingDB("apitest_db_profile_level");
 
-db.setProfilingLevel(1);
-assert(db.getProfilingLevel() == 1, "p1");
+profileLevelDB.setProfilingLevel(0);
+assert(profileLevelDB.getProfilingLevel() == 0, "prof level 0");
 
-db.setProfilingLevel(2);
-assert(db.getProfilingLevel() == 2, "p2");
+profileLevelDB.setProfilingLevel(1);
+assert(profileLevelDB.getProfilingLevel() == 1, "p1");
 
-db.setProfilingLevel(0);
-assert(db.getProfilingLevel() == 0, "prof level 0");
+profileLevelDB.setProfilingLevel(2);
+assert(profileLevelDB.getProfilingLevel() == 2, "p2");
+
+profileLevelDB.setProfilingLevel(0);
+assert(profileLevelDB.getProfilingLevel() == 0, "prof level 0");
 
 dd("f");
 asserted = false;
 try {
-    db.setProfilingLevel(10);
+    profileLevelDB.setProfilingLevel(10);
     assert(false);
 } catch (e) {
     asserted = true;

jstests/core/geo_s2cursorlimitskip.js

@@ -1,5 +1,7 @@
 // Test various cursor behaviors
-var t = db.geo_s2getmmm;
+
+var testDB = db.getSiblingDB("geo_s2cursorlimitskip");
+var t = testDB.geo_s2getmmm;
 t.drop();
 t.ensureIndex({geo: "2dsphere"});
 
@@ -42,9 +44,9 @@ assert.eq(cursor.count(), totalPointCount);
 // Disable profiling in order to drop the system.profile collection.
 // Then enable profiling for all operations. This is acceptable because
 // our test is blacklisted from the parallel suite.
-db.setProfilingLevel(0);
-db.system.profile.drop();
-db.setProfilingLevel(2);
+testDB.setProfilingLevel(0);
+testDB.system.profile.drop();
+testDB.setProfilingLevel(2);
 
 for (var j = 0; j < initialAdvance; j++) {
     assert(cursor.hasNext());
@@ -54,21 +56,21 @@ for (var j = 0; j < initialAdvance; j++) {
 assert(cursor.hasNext());
 
 // Cursor was advanced 10 times, batchSize=4 => 1 query + 2 getmore.
-assert.eq(1, db.system.profile.count({op: "query", ns: t.getFullName()}));
-assert.eq(2, db.system.profile.count({op: "getmore", ns: t.getFullName()}));
+assert.eq(1, testDB.system.profile.count({op: "query", ns: t.getFullName()}));
+assert.eq(2, testDB.system.profile.count({op: "getmore", ns: t.getFullName()}));
 
 for (var k = initialAdvance; k < totalPointCount; k++) {
     assert(cursor.hasNext());
     var tmpPoint = cursor.next();
 }
 
 // Cursor was advanced 200 times, batchSize=4 => 1 query + 49 getmore.
-assert.eq(1, db.system.profile.count({op: "query", ns: t.getFullName()}));
-assert.eq(49, db.system.profile.count({op: "getmore", ns: t.getFullName()}));
+assert.eq(1, testDB.system.profile.count({op: "query", ns: t.getFullName()}));
+assert.eq(49, testDB.system.profile.count({op: "getmore", ns: t.getFullName()}));
 
 // Disable profiling again - no longer needed for remainder of test
-db.setProfilingLevel(0);
-db.system.profile.drop();
+testDB.setProfilingLevel(0);
+testDB.system.profile.drop();
 
 // Shouldn't be any more points to look at now.
 assert(!cursor.hasNext());

jstests/libs/parallelTester.js

@@ -156,16 +156,9 @@ if (typeof _threadInject != "undefined") {
             "index_bigkeys_nofail.js",
             "index_bigkeys_validation.js",
 
-            // tests turn on profiling
-            "profile1.js",
-            "profile3.js",
-            "geo_s2cursorlimitskip.js",
-
             "mr_drop.js",
             "mr3.js",
             "indexh.js",
-            "apitest_db.js",
-            "evalb.js",
             "evald.js",
             "evalf.js",
             "killop.js",
@@ -203,11 +196,31 @@ if (typeof _threadInject != "undefined") {
             parallelFilesDir + "/fsync.js",
             parallelFilesDir + "/auth1.js",
 
-            // These tests expect the profiler to be on or off at specific points
-            // during the test run.
-            parallelFilesDir + "/cursor6.js",
+            // These tests expect the profiler to be on or off at specific points. They should not
+            // be run in parallel with tests that peform fsyncLock. User operations skip writing to
+            // the system.profile collection while the server is fsyncLocked.
+            //
+            // The profiler tests can be run in parallel with each other as they use test-specific
+            // databases.
+            parallelFilesDir + "/apitest_db.js",
+            parallelFilesDir + "/evalb.js",
+            parallelFilesDir + "/geo_s2cursorlimitskip.js",
+            parallelFilesDir + "/profile1.js",
             parallelFilesDir + "/profile2.js",
-            parallelFilesDir + "/updatee.js"
+            parallelFilesDir + "/profile3.js",
+            parallelFilesDir + "/profile_agg.js",
+            parallelFilesDir + "/profile_count.js",
+            parallelFilesDir + "/profile_delete.js",
+            parallelFilesDir + "/profile_distinct.js",
+            parallelFilesDir + "/profile_find.js",
+            parallelFilesDir + "/profile_findandmodify.js",
+            parallelFilesDir + "/profile_geonear.js",
+            parallelFilesDir + "/profile_getmore.js",
+            parallelFilesDir + "/profile_group.js",
+            parallelFilesDir + "/profile_insert.js",
+            parallelFilesDir + "/profile_mapreduce.js",
+            parallelFilesDir + "/profile_no_such_db.js",
+            parallelFilesDir + "/profile_update.js"
         ];
         var serialTests = makeKeys(serialTestsArr);