SERVER-32463 Remove FCV dependent causal consistency code

5 files changed, 45 insertions, 0 deletions

diff --git a/jstests/sharding/aggregation_currentop.js b/jstests/sharding/aggregation_currentop.js
index 2e5ece81ba1..2cae3bf11c2 100644
--- a/jstests/sharding/aggregation_currentop.js
+++ b/jstests/sharding/aggregation_currentop.js
@@ -17,6 +17,15 @@
 (function() {
     "use strict";
 
+    // Replica set nodes started with --shardsvr do not enable key generation until they are added
+    // to a sharded cluster and reject commands with gossiped clusterTime from users without the
+    // advanceClusterTime privilege. This causes ShardingTest setup to fail because the shell
+    // briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
+    // gossip that time later in setup.
+    //
+    // TODO SERVER-32672: remove this flag.
+    TestData.skipGossipingClusterTime = true;
+
     const key = "jstests/libs/key1";
 
     // Create a new sharded cluster for testing. We set the internalQueryExecYieldIterations
diff --git a/jstests/sharding/auth.js b/jstests/sharding/auth.js
index 8a87be3e68f..155bd44b2dc 100644
--- a/jstests/sharding/auth.js
+++ b/jstests/sharding/auth.js
@@ -11,6 +11,15 @@
     'use strict';
     load("jstests/replsets/rslib.js");
 
+    // Replica set nodes started with --shardsvr do not enable key generation until they are added
+    // to a sharded cluster and reject commands with gossiped clusterTime from users without the
+    // advanceClusterTime privilege. This causes ShardingTest setup to fail because the shell
+    // briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
+    // gossip that time later in setup.
+    //
+    // TODO SERVER-32672: remove this flag.
+    TestData.skipGossipingClusterTime = true;
+
     var adminUser = {db: "admin", username: "foo", password: "bar"};
 
     var testUser = {db: "test", username: "bar", password: "baz"};
diff --git a/jstests/sharding/authCommands.js b/jstests/sharding/authCommands.js
index 497a5748466..8ad74f23db3 100644
--- a/jstests/sharding/authCommands.js
+++ b/jstests/sharding/authCommands.js
@@ -6,6 +6,15 @@
 
     load("jstests/replsets/rslib.js");
 
+    // Replica set nodes started with --shardsvr do not enable key generation until they are added
+    // to a sharded cluster and reject commands with gossiped clusterTime from users without the
+    // advanceClusterTime privilege. This causes ShardingTest setup to fail because the shell
+    // briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
+    // gossip that time later in setup.
+    //
+    // TODO SERVER-32672: remove this flag.
+    TestData.skipGossipingClusterTime = true;
+
     var st = new ShardingTest({
         shards: 2,
         rs: {oplogSize: 10, useHostname: false},
diff --git a/jstests/sharding/auth_slaveok_routing.js b/jstests/sharding/auth_slaveok_routing.js
index e55c253ee9b..51cfd97f62f 100644
--- a/jstests/sharding/auth_slaveok_routing.js
+++ b/jstests/sharding/auth_slaveok_routing.js
@@ -13,6 +13,15 @@
     'use strict';
     load("jstests/replsets/rslib.js");
 
+    // Replica set nodes started with --shardsvr do not enable key generation until they are added
+    // to a sharded cluster and reject commands with gossiped clusterTime from users without the
+    // advanceClusterTime privilege. This causes ShardingTest setup to fail because the shell
+    // briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
+    // gossip that time later in setup.
+    //
+    // TODO SERVER-32672: remove this flag.
+    TestData.skipGossipingClusterTime = true;
+
     /**
      * Checks if a query to the given collection will be routed to the secondary. Returns true if
      * query was routed to a secondary node.
diff --git a/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js b/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
index a5ae6c62aa6..774c1d7dd01 100644
--- a/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
+++ b/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
@@ -15,6 +15,15 @@
 // shard does not have a primary.
 TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
 
+// Replica set nodes started with --shardsvr do not enable key generation until they are added to a
+// sharded cluster and reject commands with gossiped clusterTime from users without the
+// advanceClusterTime privilege. This causes ShardingTest setup to fail because the shell briefly
+// authenticates as __system and recieves clusterTime metadata then will fail trying to gossip that
+// time later in setup.
+//
+// TODO SERVER-32672: remove this flag.
+TestData.skipGossipingClusterTime = true;
+
 var options = {rs: true, rsOptions: {nodes: 2}, keyFile: "jstests/libs/key1"};
 
 var st = new ShardingTest({shards: 3, mongos: 1, other: options});