RUBY-1855 Run all transaction tests on sharded clusters (#1404)

p-mongo · web-flow · commit 7050c6da0d95 · 2019-07-12T12:51:15.000-04:00
* RUBY-1855 Sync remaining transaction tests to run on sharded clusters skip other ones * RUBY-1855 Run distinct prep prior to setting fail points in sharded clusters
diff --git a/spec/spec_tests/data/transactions/abort.yml b/spec/spec_tests/data/transactions/abort.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/bulk.yml b/spec/spec_tests/data/transactions/bulk.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/causal-consistency.yml b/spec/spec_tests/data/transactions/causal-consistency.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/commit.yml b/spec/spec_tests/data/transactions/commit.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
@@ -231,7 +234,6 @@ tests:
           - _id: 1
 
   - description: write concern error on commit
-    skipReason: "SERVER-37458 Mongos does not yet support writeConcern on commit"
     operations:
       - name: startTransaction
         object: session0
diff --git a/spec/spec_tests/data/transactions/count.yml b/spec/spec_tests/data/transactions/count.yml
@@ -3,6 +3,9 @@ runOn:
     -
         minServerVersion: "4.0.2"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/delete.yml b/spec/spec_tests/data/transactions/delete.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/error-labels.yml b/spec/spec_tests/data/transactions/error-labels.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/errors-client.yml b/spec/spec_tests/data/transactions/errors-client.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/errors.yml b/spec/spec_tests/data/transactions/errors.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/findOneAndDelete.yml b/spec/spec_tests/data/transactions/findOneAndDelete.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/findOneAndReplace.yml b/spec/spec_tests/data/transactions/findOneAndReplace.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/findOneAndUpdate.yml b/spec/spec_tests/data/transactions/findOneAndUpdate.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/insert.yml b/spec/spec_tests/data/transactions/insert.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/isolation.yml b/spec/spec_tests/data/transactions/isolation.yml
@@ -4,6 +4,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/read-concern.yml b/spec/spec_tests/data/transactions/read-concern.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/read-pref.yml b/spec/spec_tests/data/transactions/read-pref.yml
@@ -3,6 +3,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/reads.yml b/spec/spec_tests/data/transactions/reads.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/retryable-abort.yml b/spec/spec_tests/data/transactions/retryable-abort.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/retryable-commit.yml b/spec/spec_tests/data/transactions/retryable-commit.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/retryable-writes.yml b/spec/spec_tests/data/transactions/retryable-writes.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/run-command.yml b/spec/spec_tests/data/transactions/run-command.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/transaction-options.yml b/spec/spec_tests/data/transactions/transaction-options.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/spec_tests/data/transactions/update.yml b/spec/spec_tests/data/transactions/update.yml
@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
diff --git a/spec/support/transactions.rb b/spec/support/transactions.rb
@@ -34,6 +34,12 @@ def define_transactions_spec_tests(test_paths)
               unless SpecConfig.instance.addresses.length > 1
                 skip "Test requires multiple mongoses"
               end
+            else
+              # Many transaction spec tests that do not specifically deal with
+              # sharded transactions fail when run against a multi-mongos cluster
+              if SpecConfig.instance.addresses.length > 1
+                skip "Test does not specify multiple mongoses"
+              end
             end
           end
 
diff --git a/spec/support/transactions/test.rb b/spec/support/transactions/test.rb
@@ -62,10 +62,15 @@ def initialize(data, test, spec)
           {}
         end
         @fail_point = test['failPoint']
-        @operations = test['operations']
-        @expectations = test['expectations']
         @skip_reason = test['skipReason']
         @multiple_mongoses = test['useMultipleMongoses']
+
+        @operations = test['operations']
+        @ops = @operations.map do |op|
+          Operation.new(op)
+        end
+
+        @expectations = test['expectations']
         if test['outcome']
           @outcome = Mongo::CRUD::Outcome.new(test['outcome'])
         end
@@ -145,12 +150,6 @@ def mongos_each_direct_client
       def run
         test_client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
 
-        $distinct_ran ||= if description =~ /distinct/ || @ops.any? { |op| op.name == 'distinct' }
-          mongos_each_direct_client do |direct_client|
-            direct_client['test'].distinct('foo').to_a
-          end
-        end
-
         results = @ops.map do |op|
           op.execute(@collection, @session0, @session1)
         end
@@ -199,16 +198,19 @@ def setup_test
         support_client.command(create: @spec.collection_name, writeConcern: { w: :majority })
 
         coll.insert_many(@data) unless @data.empty?
+
+        $distinct_ran ||= if description =~ /distinct/ || @ops.any? { |op| op.name == 'distinct' }
+          mongos_each_direct_client do |direct_client|
+            direct_client['test'].distinct('foo').to_a
+          end
+        end
+
         admin_support_client.command(@fail_point) if @fail_point
 
         @collection = test_client[@spec.collection_name]
 
         @session0 = test_client.start_session(@session_options[:session0] || {})
         @session1 = test_client.start_session(@session_options[:session1] || {})
-
-        @ops = @operations.map do |op|
-          Operation.new(op)
-        end
       end
 
       def teardown_test

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@ runOn:`
`2`	`2`	`-`
`3`	`3`	`minServerVersion: "4.0"`
`4`	`4`	`topology: ["replicaset"]`
	`5`	`+ -`
	`6`	`+ minServerVersion: "4.1.8"`
	`7`	`+ topology: ["sharded"]`
`5`	`8`
`6`	`9`	`database_name: &database_name "transaction-tests"`
`7`	`10`	`collection_name: &collection_name "test"`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@ runOn:`
`3`	`3`	`-`
`4`	`4`	`minServerVersion: "4.0.2"`
`5`	`5`	`topology: ["replicaset"]`
	`6`	`+ -`
	`7`	`+ minServerVersion: "4.1.8"`
	`8`	`+ topology: ["sharded"]`
`6`	`9`
`7`	`10`	`database_name: &database_name "transaction-tests"`
`8`	`11`	`collection_name: &collection_name "test"`