mongo 2.20.2 → 2.21.0

data/spec/spec_tests/data/client_side_operations_timeout/tailable-awaitData.yml

@@ -0,0 +1,247 @@
+description: "timeoutMS behaves correctly for tailable awaitData cursors"
+
+schemaVersion: "1.9"
+
+runOnRequirements:
+  - minServerVersion: "4.4"
+
+createEntities:
+  - client:
+      id: &failPointClient failPointClient
+      useMultipleMongoses: false
+  - client:
+      id: &client client
+      uriOptions:
+        timeoutMS: 10
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database database
+      client: *client
+      databaseName: &databaseName test
+  - collection:
+      id: &collection collection
+      database: *database
+      collectionName: &collectionName coll
+
+initialData:
+  - collectionName: *collectionName
+    databaseName: *databaseName
+    createOptions:
+      capped: true
+      size: 500
+    documents:
+      - { _id: 0 }
+      - { _id: 1 }
+
+tests:
+  - description: "error if timeoutMode is cursor_lifetime"
+    operations:
+      - name: find
+        object: *collection
+        arguments:
+          filter: {}
+          timeoutMode: cursorLifetime
+          cursorType: tailableAwait
+        expectError:
+          isClientError: true
+
+  - description: "error if maxAwaitTimeMS is greater than timeoutMS"
+    operations:
+      - name: find
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailableAwait
+          timeoutMS: 5
+          maxAwaitTimeMS: 10
+        expectError:
+          isClientError: true
+
+  - description: "error if maxAwaitTimeMS is equal to timeoutMS"
+    operations:
+      - name: find
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailableAwait
+          timeoutMS: 5
+          maxAwaitTimeMS: 5
+        expectError:
+          isClientError: true
+
+  - description: "timeoutMS applied to find"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: ["find"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: find
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailableAwait
+        expectError:
+          isTimeoutError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: true
+                maxTimeMS: { $$exists: true }
+
+  # If maxAwaitTimeMS is not set, timeoutMS should be refreshed for the getMore and the getMore should not have a
+  # maxTimeMS field.
+  - description: "timeoutMS is refreshed for getMore if maxAwaitTimeMS is not set"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+              failCommands: ["find", "getMore"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: createFindCursor
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailableAwait
+          timeoutMS: 29
+          batchSize: 1
+        saveResultAsEntity: &tailableCursor tailableCursor
+      # Iterate twice to force a getMore. The first iteration will return the document from the first batch and the
+      # second will do a getMore.
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: true
+                maxTimeMS: { $$exists: true }
+          - commandStartedEvent:
+              commandName: getMore
+              databaseName: *databaseName
+              command:
+                getMore: { $$type: ["int", "long"] }
+                collection: *collectionName
+                maxTimeMS: { $$exists: false }
+
+  # If maxAwaitTimeMS is set for the initial command, timeoutMS should still be refreshed for the getMore and the
+  # getMore command should have a maxTimeMS field.
+  - description: "timeoutMS is refreshed for getMore if maxAwaitTimeMS is set"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+              failCommands: ["find", "getMore"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: createFindCursor
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailableAwait
+          timeoutMS: 29
+          batchSize: 1
+          maxAwaitTimeMS: 1
+        saveResultAsEntity: &tailableCursor tailableCursor
+      # Iterate twice to force a getMore.
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: true
+                maxTimeMS: { $$exists: true }
+          - commandStartedEvent:
+              commandName: getMore
+              databaseName: *databaseName
+              command:
+                getMore: { $$type: ["int", "long"] }
+                collection: *collectionName
+                maxTimeMS: 1
+
+  # The timeoutMS value should be refreshed for getMore's. This is a failure test. The find inherits timeoutMS=10 from
+  # the collection and the getMore blocks for 15ms, causing iteration to fail with a timeout error.
+  - description: "timeoutMS is refreshed for getMore - failure"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: ["getMore"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: createFindCursor
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailableAwait
+          batchSize: 1
+        saveResultAsEntity: &tailableCursor tailableCursor
+      # Iterate twice to force a getMore.
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+        expectError:
+          isTimeoutError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: true
+                maxTimeMS: { $$exists: true }
+          - commandStartedEvent:
+              commandName: getMore
+              databaseName: *databaseName
+              command:
+                getMore: { $$type: ["int", "long"] }
+                collection: *collectionName

data/spec/spec_tests/data/client_side_operations_timeout/tailable-non-awaitData.yml

@@ -0,0 +1,181 @@
+description: "timeoutMS behaves correctly for tailable non-awaitData cursors"
+
+schemaVersion: "1.9"
+
+runOnRequirements:
+  - minServerVersion: "4.4"
+
+createEntities:
+  - client:
+      id: &failPointClient failPointClient
+      useMultipleMongoses: false
+  - client:
+      id: &client client
+      uriOptions:
+        timeoutMS: 10
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database database
+      client: *client
+      databaseName: &databaseName test
+  - collection:
+      id: &collection collection
+      database: *database
+      collectionName: &collectionName coll
+
+initialData:
+  - collectionName: *collectionName
+    databaseName: *databaseName
+    createOptions:
+      capped: true
+      size: 500
+    documents:
+      - { _id: 0 }
+      - { _id: 1 }
+
+tests:
+  - description: "error if timeoutMode is cursor_lifetime"
+    operations:
+      - name: find
+        object: *collection
+        arguments:
+          filter: {}
+          timeoutMode: cursorLifetime
+          cursorType: tailable
+        expectError:
+          isClientError: true
+
+  - description: "timeoutMS applied to find"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: ["find"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: find
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailable
+        expectError:
+          isTimeoutError: true
+    expectEvents:
+      - client: *client
+        events:
+          # Due to SERVER-51153, the find command should not contain a maxTimeMS field for tailable non-awaitData
+          # cursors because that would cap the lifetime of the created cursor.
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: { $$exists: false }
+                maxTimeMS: { $$exists: false }
+
+  # The timeoutMS option should apply separately to the initial "find" and each getMore. This is a success test. The
+  # find is executed with timeoutMS=20 and both find and getMore commands are configured to block for 15ms each. Neither
+  # exceeds the timeout so the operation succeeds.
+  - description: "timeoutMS is refreshed for getMore - success"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+              failCommands: ["find", "getMore"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: createFindCursor
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailable
+          timeoutMS: 20
+          batchSize: 1
+        saveResultAsEntity: &tailableCursor tailableCursor
+      # Iterate the cursor twice: the first iteration will return the document from the batch in the find and the
+      # second will do a getMore.
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: { $$exists: false }
+                maxTimeMS: { $$exists: false }
+          - commandStartedEvent:
+              commandName: getMore
+              databaseName: *databaseName
+              command:
+                getMore: { $$type: ["int", "long"] }
+                collection: *collectionName
+                maxTimeMS: { $$exists: false }
+
+  # The timeoutMS option should apply separately to the initial "find" and each getMore. This is a failure test. The
+  # find inherits timeoutMS=10 from the collection and the getMore command blocks for 15ms, causing iteration to fail
+  # with a timeout error.
+  - description: "timeoutMS is refreshed for getMore - failure"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *failPointClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: ["getMore"]
+              blockConnection: true
+              blockTimeMS: 15
+      - name: createFindCursor
+        object: *collection
+        arguments:
+          filter: {}
+          cursorType: tailable
+          batchSize: 1
+        saveResultAsEntity: &tailableCursor tailableCursor
+      # Iterate the cursor twice: the first iteration will return the document from the batch in the find and the
+      # second will do a getMore.
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+      - name: iterateUntilDocumentOrError
+        object: *tailableCursor
+        expectError:
+          isTimeoutError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: find
+              databaseName: *databaseName
+              command:
+                find: *collectionName
+                tailable: true
+                awaitData: { $$exists: false }
+                maxTimeMS: { $$exists: false }
+          - commandStartedEvent:
+              commandName: getMore
+              databaseName: *databaseName
+              command:
+                getMore: { $$type: ["int", "long"] }
+                collection: *collectionName
+                maxTimeMS: { $$exists: false }

data/spec/spec_tests/data/crud_unified/aggregate-write-readPreference.yml

@@ -8,6 +8,8 @@ runOnRequirements:
     # https://jira.mongodb.org/browse/DRIVERS-291
     maxServerVersion: "7.99"
     topologies: [ replicaset, sharded, load-balanced ]
+    # SERVER-90047: failures against latest server necessitate adding this for now
+    maxServerVersion: "8.0.0"
 
 _yamlAnchors:
   readConcern: &readConcern
@@ -61,6 +63,8 @@ tests:
   - description: "Aggregate with $out includes read preference for 5.0+ server"
     runOnRequirements:
       - minServerVersion: "5.0"
+        # https://jira.mongodb.org/browse/RUBY-3539
+        maxServerVersion: "7.99"
         serverless: "forbid"
     operations:
       - object: *collection0

data/spec/spec_tests/data/crud_unified/db-aggregate-write-readPreference.yml

@@ -11,6 +11,8 @@ runOnRequirements:
     maxServerVersion: "7.99"
     topologies: [ replicaset ]
     serverless: forbid
+    # SERVER-90047: failures against latest server necessitate adding this for now
+    maxServerVersion: "8.0.0"
 
 _yamlAnchors:
   readConcern: &readConcern
@@ -54,6 +56,8 @@ tests:
   - description: "Database-level aggregate with $out includes read preference for 5.0+ server"
     runOnRequirements:
       - minServerVersion: "5.0"
+        # https://jira.mongodb.org/browse/RUBY-3539
+        maxServerVersion: "7.99"
         serverless: "forbid"
     operations:
       - object: *database0

data/spec/spec_tests/data/crud_unified/find-test-all-options.yml

@@ -1,3 +1,6 @@
+# This spec is specific to the ruby driver, and is not part of the general
+# `specifications` repo.
+
 description: "find options"
 
 schemaVersion: "1.0"
@@ -162,11 +165,30 @@ tests:
               commandName: find
               databaseName: *database0Name
 
+  - description: "timeoutMS"
+    operations:
+      - name: find
+        arguments:
+          filter: *filter
+          timeoutMS: &timeoutMS 1000
+        object: *collection0
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                find: *collection0Name
+                filter: *filter
+                maxTimeMS: { $$type: [ int ] }
+              commandName: find
+              databaseName: *database0Name
+
   - description: "max"
     operations:
       - name: find
         arguments:
           filter: *filter
+          hint: { _id: 1 }
           max: &max { _id: 10 }
         object: *collection0
     expectEvents:
@@ -182,6 +204,11 @@ tests:
 
   - description: "min"
     operations:
+      - name: createIndex
+        object: *collection0
+        arguments:
+          name: "name_1"
+          keys: { name: 1 }
       - name: find
         arguments:
           filter: *filter
@@ -191,6 +218,8 @@ tests:
     expectEvents:
       - client: *client0
         events:
+          - commandStartedEvent:
+              commandName: createIndexes
           - commandStartedEvent:
               command:
                 find: *collection0Name

data/spec/spec_tests/server_selection_rtt_spec.rb

@@ -15,18 +15,18 @@ describe 'Server Selection moving average round trip time calculation' do
 
     context(spec.description) do
 
-      let(:averager) do
-        Mongo::Server::RoundTripTimeAverager.new
+      let(:calculator) do
+        Mongo::Server::RoundTripTimeCalculator.new
       end
 
       before do
-        averager.instance_variable_set(:@average_round_trip_time, spec.average_rtt)
-        averager.instance_variable_set(:@last_round_trip_time, spec.new_rtt)
-        averager.send(:update_average_round_trip_time)
+        calculator.instance_variable_set(:@average_round_trip_time, spec.average_rtt)
+        calculator.instance_variable_set(:@last_round_trip_time, spec.new_rtt)
+        calculator.update_average_round_trip_time
       end
 
       it 'correctly calculates the moving average round trip time' do
-        expect(averager.average_round_trip_time).to eq(spec.new_average_rtt)
+        expect(calculator.average_round_trip_time).to eq(spec.new_average_rtt)
       end
     end
   end