From d0e6f87351312a299a17f6d63e3f2f4db834ae1f Mon Sep 17 00:00:00 2001
From: Esha Maharishi <esha.maharishi@mongodb.com>
Date: Tue, 12 May 2020 17:26:45 -0400
Subject: SERVER-47992 Make disableResumableRangeDeleter just prevent ranges
 from being submitted for deletio

---
 jstests/ssl/libs/ssl_helpers.js              | 13 +++----------
 jstests/ssl/mixed_mode_sharded.js            |  3 +++
 jstests/ssl/mixed_mode_sharded_transition.js | 12 ++++++------
 3 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'jstests/ssl')

diff --git a/jstests/ssl/libs/ssl_helpers.js b/jstests/ssl/libs/ssl_helpers.js
index 6e1c9756420..2045cc464b9 100644
--- a/jstests/ssl/libs/ssl_helpers.js
+++ b/jstests/ssl/libs/ssl_helpers.js
@@ -110,7 +110,7 @@ function testShardedLookup(shardingTest) {
  * Takes in two mongod/mongos configuration options and runs a basic
  * sharding test to see if they can work together...
  */
-function mixedShardTest(options1, options2, shouldSucceed, disableResumableRangeDeleter) {
+function mixedShardTest(options1, options2, shouldSucceed) {
     let authSucceeded = false;
     try {
         // Start ShardingTest with enableBalancer because ShardingTest attempts to turn
@@ -123,19 +123,12 @@ function mixedShardTest(options1, options2, shouldSucceed, disableResumableRange
         //
         // Once SERVER-14017 is fixed the "enableBalancer" line can be removed.
         // TODO: SERVER-43899 Make sharding_with_x509.js and mixed_mode_sharded_transition.js start
-        // shards as replica sets and remove disableResumableRangeDeleter parameter.
-        let otherOptions = {enableBalancer: true};
-
-        if (disableResumableRangeDeleter) {
-            otherOptions.shardAsReplicaSet = false;
-            otherOptions.shardOptions = {setParameter: {"disableResumableRangeDeleter": true}};
-        }
-
+        // shards as replica sets.
         var st = new ShardingTest({
             mongos: [options1],
             config: [options1],
             shards: [options1, options2],
-            other: otherOptions
+            other: {enableBalancer: true, shardAsReplicaSet: false},
         });
 
         // Create admin user in case the options include auth
diff --git a/jstests/ssl/mixed_mode_sharded.js b/jstests/ssl/mixed_mode_sharded.js
index 40271d2d2d3..523393bff07 100644
--- a/jstests/ssl/mixed_mode_sharded.js
+++ b/jstests/ssl/mixed_mode_sharded.js
@@ -1,6 +1,9 @@
 /**
  * This test checks if different mixtures of ssl modes
  * in a sharded cluster can or cannot function
+ *
+ * TODO (SERVER-48261): Fix test to allow it to work with the resumable range deleter enabled.
+ * @tags: [__TEMPORARILY_DISABLED__]
  */
 load("jstests/ssl/libs/ssl_helpers.js");
 
diff --git a/jstests/ssl/mixed_mode_sharded_transition.js b/jstests/ssl/mixed_mode_sharded_transition.js
index f6b0d7bbaec..9cfd86495ed 100644
--- a/jstests/ssl/mixed_mode_sharded_transition.js
+++ b/jstests/ssl/mixed_mode_sharded_transition.js
@@ -4,6 +4,9 @@
  *
  * NOTE: This test is similar to the mixed_mode_sharded_transition.js in the sslSpecial
  * test suite. This suite must use ssl so it cannot test modes without ssl.
+ *
+ * TODO (SERVER-48261): Fix test to allow it to work with the resumable range deleter enabled.
+ * @tags: [__TEMPORARILY_DISABLED__]
  */
 
 load('jstests/ssl/libs/ssl_helpers.js');
@@ -11,8 +14,6 @@ load('jstests/ssl/libs/ssl_helpers.js');
 (function() {
 'use strict';
 
-const disableResumableRangeDeleter = true;
-
 var transitionToX509AllowSSL =
     Object.merge(allowSSL, {transitionToAuth: '', clusterAuthMode: 'x509'});
 var transitionToX509PreferSSL =
@@ -20,16 +21,15 @@ var transitionToX509PreferSSL =
 var x509RequireSSL = Object.merge(requireSSL, {clusterAuthMode: 'x509'});
 
 function testCombos(opt1, opt2, shouldSucceed) {
-    mixedShardTest(opt1, opt2, shouldSucceed, disableResumableRangeDeleter);
-    mixedShardTest(opt2, opt1, shouldSucceed, disableResumableRangeDeleter);
+    mixedShardTest(opt1, opt2, shouldSucceed);
+    mixedShardTest(opt2, opt1, shouldSucceed);
 }
 
 print('=== Testing transitionToAuth/allowSSL - transitionToAuth/preferSSL cluster ===');
 testCombos(transitionToX509AllowSSL, transitionToX509PreferSSL, true);
 
 print('=== Testing transitionToAuth/preferSSL - transitionToAuth/preferSSL cluster ===');
-mixedShardTest(
-    transitionToX509PreferSSL, transitionToX509PreferSSL, true, disableResumableRangeDeleter);
+mixedShardTest(transitionToX509PreferSSL, transitionToX509PreferSSL, true);
 
 print('=== Testing transitionToAuth/preferSSL - x509/requireSSL cluster ===');
 testCombos(transitionToX509PreferSSL, x509RequireSSL, true);
-- 
cgit v1.2.1