RubyGems - mongo - Versions diffs - 2.8.0 → 2.9.0.rc0 - Mend

mongo 2.8.0 → 2.9.0.rc0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (276) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data.tar.gz.sig +0 -0
data/Rakefile +12 -0
data/lib/mongo.rb +15 -1
data/lib/mongo/address/ipv6.rb +0 -2
data/lib/mongo/auth/scram/conversation.rb +0 -3
data/lib/mongo/bulk_write/result_combiner.rb +12 -2
data/lib/mongo/client.rb +59 -6
data/lib/mongo/cluster.rb +19 -8
data/lib/mongo/cluster/reapers/cursor_reaper.rb +0 -2
data/lib/mongo/cluster/reapers/socket_reaper.rb +12 -9
data/lib/mongo/collection.rb +1 -1
data/lib/mongo/collection/view/aggregation.rb +5 -1
data/lib/mongo/collection/view/builder/map_reduce.rb +1 -1
data/lib/mongo/collection/view/change_stream.rb +30 -10
data/lib/mongo/collection/view/iterable.rb +13 -6
data/lib/mongo/collection/view/map_reduce.rb +12 -10
data/lib/mongo/collection/view/readable.rb +19 -14
data/lib/mongo/cursor.rb +12 -8
data/lib/mongo/database.rb +10 -7
data/lib/mongo/database/view.rb +18 -11
data/lib/mongo/error.rb +2 -2
data/lib/mongo/error/connection_check_out_timeout.rb +49 -0
data/lib/mongo/error/operation_failure.rb +9 -9
data/lib/mongo/error/parser.rb +25 -3
data/lib/mongo/error/pool_closed_error.rb +43 -0
data/lib/mongo/error/sdam_error_detection.rb +18 -0
data/lib/mongo/grid/file/chunk.rb +0 -2
data/lib/mongo/grid/fs_bucket.rb +26 -12
data/lib/mongo/grid/stream/read.rb +36 -21
data/lib/mongo/index/view.rb +11 -7
data/lib/mongo/logger.rb +0 -2
data/lib/mongo/monitoring.rb +31 -0
data/lib/mongo/monitoring/cmap_log_subscriber.rb +53 -0
data/lib/mongo/monitoring/event.rb +1 -0
data/lib/mongo/monitoring/event/cmap.rb +25 -0
data/lib/mongo/monitoring/event/cmap/base.rb +28 -0
data/lib/mongo/monitoring/event/cmap/connection_check_out_failed.rb +78 -0
data/lib/mongo/monitoring/event/cmap/connection_check_out_started.rb +56 -0
data/lib/mongo/monitoring/event/cmap/connection_checked_in.rb +63 -0
data/lib/mongo/monitoring/event/cmap/connection_checked_out.rb +64 -0
data/lib/mongo/monitoring/event/cmap/connection_closed.rb +103 -0
data/lib/mongo/monitoring/event/cmap/connection_created.rb +64 -0
data/lib/mongo/monitoring/event/cmap/connection_ready.rb +64 -0
data/lib/mongo/monitoring/event/cmap/pool_cleared.rb +57 -0
data/lib/mongo/monitoring/event/cmap/pool_closed.rb +57 -0
data/lib/mongo/monitoring/event/cmap/pool_created.rb +63 -0
data/lib/mongo/monitoring/event/command_started.rb +12 -3
data/lib/mongo/monitoring/publishable.rb +10 -2
data/lib/mongo/operation.rb +0 -1
data/lib/mongo/operation/find/legacy/result.rb +1 -0
data/lib/mongo/operation/list_collections/result.rb +7 -1
data/lib/mongo/operation/result.rb +10 -1
data/lib/mongo/operation/shared/executable.rb +15 -0
data/lib/mongo/operation/shared/result/use_legacy_error_parser.rb +29 -0
data/lib/mongo/operation/shared/specifiable.rb +0 -16
data/lib/mongo/operation/update/legacy/result.rb +1 -0
data/lib/mongo/protocol/compressed.rb +0 -2
data/lib/mongo/protocol/msg.rb +25 -2
data/lib/mongo/retryable.rb +171 -33
data/lib/mongo/server.rb +26 -7
data/lib/mongo/server/app_metadata.rb +0 -2
data/lib/mongo/server/connectable.rb +8 -2
data/lib/mongo/server/connection.rb +83 -13
data/lib/mongo/server/connection_base.rb +1 -1
data/lib/mongo/server/connection_pool.rb +439 -43
data/lib/mongo/server/monitor/connection.rb +4 -1
data/lib/mongo/session.rb +37 -5
data/lib/mongo/session/session_pool.rb +2 -2
data/lib/mongo/socket.rb +0 -2
data/lib/mongo/socket/ssl.rb +0 -2
data/lib/mongo/uri.rb +127 -66
data/lib/mongo/uri/srv_protocol.rb +35 -13
data/lib/mongo/version.rb +1 -1
data/spec/README.md +190 -63
data/spec/integration/change_stream_spec.rb +64 -0
data/spec/integration/command_spec.rb +0 -7
data/spec/integration/error_detection_spec.rb +39 -0
data/spec/integration/read_concern.rb +83 -0
data/spec/integration/retryable_writes_spec.rb +6 -50
data/spec/integration/sdam_error_handling_spec.rb +60 -7
data/spec/integration/ssl_uri_options_spec.rb +24 -0
data/spec/integration/step_down_spec.rb +197 -0
data/spec/lite_spec_helper.rb +4 -0
data/spec/mongo/client_construction_spec.rb +42 -17
data/spec/mongo/client_spec.rb +32 -1
data/spec/mongo/cluster/socket_reaper_spec.rb +2 -2
data/spec/mongo/cluster_spec.rb +36 -2
data/spec/mongo/collection/view/aggregation_spec.rb +2 -0
data/spec/mongo/collection/view/change_stream_spec.rb +28 -28
data/spec/mongo/collection/view/readable_spec.rb +1 -1
data/spec/mongo/collection/view_spec.rb +3 -1
data/spec/mongo/cursor_spec.rb +5 -5
data/spec/mongo/error/parser_spec.rb +61 -1
data/spec/mongo/grid/stream/read_spec.rb +2 -2
data/spec/mongo/monitoring/event/cmap/connection_check_out_failed_spec.rb +23 -0
data/spec/mongo/monitoring/event/cmap/connection_check_out_started_spec.rb +19 -0
data/spec/mongo/monitoring/event/cmap/connection_checked_in_spec.rb +23 -0
data/spec/mongo/monitoring/event/cmap/connection_checked_out_spec.rb +23 -0
data/spec/mongo/monitoring/event/cmap/connection_closed_spec.rb +27 -0
data/spec/mongo/monitoring/event/cmap/connection_created_spec.rb +24 -0
data/spec/mongo/monitoring/event/cmap/connection_ready_spec.rb +24 -0
data/spec/mongo/monitoring/event/cmap/pool_cleared_spec.rb +19 -0
data/spec/mongo/monitoring/event/cmap/pool_closed_spec.rb +19 -0
data/spec/mongo/monitoring/event/cmap/pool_created_spec.rb +26 -0
data/spec/mongo/operation/delete/bulk_spec.rb +1 -6
data/spec/mongo/operation/delete/command_spec.rb +1 -1
data/spec/mongo/operation/delete/op_msg_spec.rb +1 -1
data/spec/mongo/operation/delete_spec.rb +4 -4
data/spec/mongo/operation/insert/bulk_spec.rb +1 -1
data/spec/mongo/operation/insert/command_spec.rb +1 -1
data/spec/mongo/operation/insert/op_msg_spec.rb +1 -1
data/spec/mongo/operation/update/bulk_spec.rb +1 -1
data/spec/mongo/operation/update/command_spec.rb +2 -2
data/spec/mongo/operation/update/op_msg_spec.rb +2 -2
data/spec/mongo/protocol/msg_spec.rb +11 -0
data/spec/mongo/retryable_spec.rb +78 -25
data/spec/mongo/server/connection_pool_spec.rb +661 -126
data/spec/mongo/server/connection_spec.rb +55 -7
data/spec/mongo/server_spec.rb +5 -0
data/spec/mongo/uri/srv_protocol_spec.rb +135 -2
data/spec/mongo/uri_option_parsing_spec.rb +511 -0
data/spec/mongo/uri_spec.rb +42 -6
data/spec/spec_helper.rb +1 -84
data/spec/spec_tests/cmap_spec.rb +50 -0
data/spec/spec_tests/command_monitoring_spec.rb +7 -18
data/spec/spec_tests/crud_spec.rb +3 -49
data/spec/spec_tests/data/cmap/connection-must-have-id.yml +21 -0
data/spec/spec_tests/data/cmap/connection-must-order-ids.yml +21 -0
data/spec/spec_tests/data/cmap/pool-checkin-destroy-closed.yml +24 -0
data/spec/spec_tests/data/cmap/pool-checkin-destroy-stale.yml +24 -0
data/spec/spec_tests/data/cmap/pool-checkin-make-available.yml +21 -0
data/spec/spec_tests/data/cmap/pool-checkin.yml +18 -0
data/spec/spec_tests/data/cmap/pool-checkout-connection.yml +13 -0
data/spec/spec_tests/data/cmap/pool-checkout-error-closed.yml +28 -0
data/spec/spec_tests/data/cmap/pool-checkout-multiple.yml +34 -0
data/spec/spec_tests/data/cmap/pool-checkout-no-idle.yml +31 -0
data/spec/spec_tests/data/cmap/pool-checkout-no-stale.yml +29 -0
data/spec/spec_tests/data/cmap/pool-close-destroy-conns.yml +26 -0
data/spec/spec_tests/data/cmap/pool-close.yml +11 -0
data/spec/spec_tests/data/cmap/pool-create-max-size.yml +56 -0
data/spec/spec_tests/data/cmap/pool-create-min-size.yml +27 -0
data/spec/spec_tests/data/cmap/pool-create-with-options.yml +20 -0
data/spec/spec_tests/data/cmap/pool-create.yml +12 -0
data/spec/spec_tests/data/cmap/wait-queue-fairness.yml +94 -0
data/spec/spec_tests/data/cmap/wait-queue-timeout.yml +41 -0
data/spec/spec_tests/data/retryable_reads/aggregate-serverErrors.yml +157 -0
data/spec/spec_tests/data/retryable_reads/aggregate.yml +87 -0
data/spec/spec_tests/data/retryable_reads/changeStreams-client.watch-serverErrors.yml +149 -0
data/spec/spec_tests/data/retryable_reads/changeStreams-client.watch.yml +61 -0
data/spec/spec_tests/data/retryable_reads/changeStreams-db.coll.watch-serverErrors.yml +149 -0
data/spec/spec_tests/data/retryable_reads/changeStreams-db.coll.watch.yml +65 -0
data/spec/spec_tests/data/retryable_reads/changeStreams-db.watch-serverErrors.yml +153 -0
data/spec/spec_tests/data/retryable_reads/changeStreams-db.watch.yml +61 -0
data/spec/spec_tests/data/retryable_reads/count-serverErrors.yml +150 -0
data/spec/spec_tests/data/retryable_reads/count.yml +64 -0
data/spec/spec_tests/data/retryable_reads/countDocuments-serverErrors.yml +150 -0
data/spec/spec_tests/data/retryable_reads/countDocuments.yml +64 -0
data/spec/spec_tests/data/retryable_reads/distinct-serverErrors.yml +156 -0
data/spec/spec_tests/data/retryable_reads/distinct.yml +71 -0
data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount-serverErrors.yml +148 -0
data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount.yml +62 -0
data/spec/spec_tests/data/retryable_reads/find-serverErrors.yml +160 -0
data/spec/spec_tests/data/retryable_reads/find.yml +86 -0
data/spec/spec_tests/data/retryable_reads/findOne-serverErrors.yml +154 -0
data/spec/spec_tests/data/retryable_reads/findOne.yml +68 -0
data/spec/spec_tests/data/retryable_reads/gridfs-download-serverErrors.yml +173 -0
data/spec/spec_tests/data/retryable_reads/gridfs-download.yml +79 -0
data/spec/spec_tests/data/retryable_reads/gridfs-downloadByName-serverErrors.yml +174 -0
data/spec/spec_tests/data/retryable_reads/gridfs-downloadByName.yml +79 -0
data/spec/spec_tests/data/retryable_reads/listCollectionNames-serverErrors.yml +143 -0
data/spec/spec_tests/data/retryable_reads/listCollectionNames.yml +59 -0
data/spec/spec_tests/data/retryable_reads/listCollectionObjects-serverErrors.yml +144 -0
data/spec/spec_tests/data/retryable_reads/listCollectionObjects.yml +59 -0
data/spec/spec_tests/data/retryable_reads/listCollections-serverErrors.yml +143 -0
data/spec/spec_tests/data/retryable_reads/listCollections.yml +59 -0
data/spec/spec_tests/data/retryable_reads/listDatabaseNames-serverErrors.yml +143 -0
data/spec/spec_tests/data/retryable_reads/listDatabaseNames.yml +59 -0
data/spec/spec_tests/data/retryable_reads/listDatabaseObjects-serverErrors.yml +144 -0
data/spec/spec_tests/data/retryable_reads/listDatabaseObjects.yml +59 -0
data/spec/spec_tests/data/retryable_reads/listDatabases-serverErrors.yml +144 -0
data/spec/spec_tests/data/retryable_reads/listDatabases.yml +59 -0
data/spec/spec_tests/data/retryable_reads/listIndexNames-serverErrors.yml +144 -0
data/spec/spec_tests/data/retryable_reads/listIndexNames.yml +60 -0
data/spec/spec_tests/data/retryable_reads/listIndexes-serverErrors.yml +145 -0
data/spec/spec_tests/data/retryable_reads/listIndexes.yml +60 -0
data/spec/spec_tests/data/retryable_reads/mapReduce.yml +60 -0
data/spec/spec_tests/data/retryable_writes/bulkWrite-serverErrors.yml +10 -7
data/spec/spec_tests/data/retryable_writes/bulkWrite.yml +15 -22
data/spec/spec_tests/data/retryable_writes/deleteMany.yml +22 -0
data/spec/spec_tests/data/retryable_writes/deleteOne-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/deleteOne.yml +5 -8
data/spec/spec_tests/data/retryable_writes/findOneAndDelete-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/findOneAndDelete.yml +5 -8
data/spec/spec_tests/data/retryable_writes/findOneAndReplace-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/findOneAndReplace.yml +5 -8
data/spec/spec_tests/data/retryable_writes/findOneAndUpdate-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/findOneAndUpdate.yml +5 -8
data/spec/spec_tests/data/retryable_writes/insertMany-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/insertMany.yml +5 -8
data/spec/spec_tests/data/retryable_writes/insertOne-serverErrors.yml +10 -45
data/spec/spec_tests/data/retryable_writes/insertOne.yml +5 -8
data/spec/spec_tests/data/retryable_writes/replaceOne-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/replaceOne.yml +5 -8
data/spec/spec_tests/data/retryable_writes/updateMany.yml +27 -0
data/spec/spec_tests/data/retryable_writes/updateOne-serverErrors.yml +8 -7
data/spec/spec_tests/data/retryable_writes/updateOne.yml +5 -14
data/spec/spec_tests/data/transactions/abort.yml +7 -2
data/spec/spec_tests/data/transactions/bulk.yml +7 -2
data/spec/spec_tests/data/transactions/causal-consistency.yml +11 -4
data/spec/spec_tests/data/transactions/commit.yml +11 -4
data/spec/spec_tests/data/transactions/count.yml +64 -0
data/spec/spec_tests/data/transactions/delete.yml +7 -2
data/spec/spec_tests/data/transactions/error-labels.yml +8 -2
data/spec/spec_tests/data/transactions/errors.yml +7 -2
data/spec/spec_tests/data/transactions/findOneAndDelete.yml +7 -2
data/spec/spec_tests/data/transactions/findOneAndReplace.yml +7 -2
data/spec/spec_tests/data/transactions/findOneAndUpdate.yml +7 -2
data/spec/spec_tests/data/transactions/insert.yml +9 -2
data/spec/spec_tests/data/transactions/isolation.yml +7 -2
data/spec/spec_tests/data/transactions/read-concern.yml +15 -6
data/spec/spec_tests/data/transactions/read-pref.yml +7 -2
data/spec/spec_tests/data/transactions/reads.yml +8 -48
data/spec/spec_tests/data/transactions/retryable-abort.yml +7 -2
data/spec/spec_tests/data/transactions/retryable-commit.yml +7 -2
data/spec/spec_tests/data/transactions/retryable-writes.yml +7 -2
data/spec/spec_tests/data/transactions/run-command.yml +7 -2
data/spec/spec_tests/data/transactions/transaction-options.yml +7 -2
data/spec/spec_tests/data/transactions/update.yml +7 -2
data/spec/spec_tests/data/transactions/write-concern.yml +7 -2
data/spec/spec_tests/data/transactions_api/callback-aborts.yml +6 -1
data/spec/spec_tests/data/transactions_api/callback-commits.yml +6 -1
data/spec/spec_tests/data/transactions_api/callback-retry.yml +6 -1
data/spec/spec_tests/data/transactions_api/commit-retry.yml +6 -1
data/spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml +6 -3
data/spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml +6 -1
data/spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml +6 -1
data/spec/spec_tests/data/transactions_api/commit.yml +6 -1
data/spec/spec_tests/data/transactions_api/transaction-options.yml +6 -1
data/spec/spec_tests/retryable_reads_spec.rb +11 -0
data/spec/spec_tests/retryable_writes_spec.rb +4 -69
data/spec/spec_tests/transactions_api_spec.rb +42 -37
data/spec/spec_tests/transactions_spec.rb +42 -33
data/spec/support/authorization.rb +12 -0
data/spec/support/change_streams/operation.rb +1 -1
data/spec/support/client_registry.rb +20 -0
data/spec/support/cluster_config.rb +16 -15
data/spec/support/cluster_tools.rb +346 -0
data/spec/support/cmap.rb +367 -0
data/spec/support/cmap/verifier.rb +46 -0
data/spec/support/command_monitoring.rb +4 -6
data/spec/support/common_shortcuts.rb +6 -0
data/spec/support/connection_string.rb +2 -2
data/spec/support/crud.rb +171 -184
data/spec/support/crud/operation.rb +43 -0
data/spec/support/crud/outcome.rb +53 -0
data/spec/support/crud/read.rb +102 -12
data/spec/support/crud/requirement.rb +69 -0
data/spec/support/crud/spec.rb +68 -0
data/spec/support/crud/test.rb +141 -0
data/spec/support/crud/verifier.rb +96 -18
data/spec/support/crud/write.rb +18 -3
data/spec/support/event_subscriber.rb +15 -0
data/spec/support/primary_socket.rb +2 -2
data/spec/support/spec_config.rb +89 -20
data/spec/support/transactions.rb +2 -306
data/spec/support/transactions/operation.rb +7 -7
data/spec/support/transactions/spec.rb +28 -0
data/spec/support/transactions/test.rb +191 -0
data/spec/support/utils.rb +123 -0
metadata +202 -9
metadata.gz.sig +0 -0
data/lib/mongo/server/connection_pool/queue.rb +0 -359
data/spec/mongo/server/connection_pool/queue_spec.rb +0 -353
data/spec/support/transactions/verifier.rb +0 -97

data/spec/spec_tests/data/retryable_reads/changeStreams-db.coll.watch-serverErrors.yml ADDED

@@ -0,0 +1,149 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+database_name: &database_name "retryable-reads-tests"
+collection_name: &collection_name "coll"
+data:
+    - {_id: 1, x: 11}
+    - {_id: 2, x: 22}
+    - {_id: 3, x: 33}
+tests:
+    -
+        description: "db.coll.watch succeeds after InterruptedAtShutdown"
+        failPoint: &failCommand_failPoint
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data: { failCommands: [aggregate], errorCode: 11600 }
+        operations:
+            - &retryable_operation
+                name: watch
+                object: collection
+        expectations:
+            - &retryable_command_started_event
+                command_started_event:
+                    command:
+                        aggregate: *collection_name
+                        cursor: {}
+                        pipeline: [ { $changeStream: { fullDocument: "default" } } ]
+                    database_name: *database_name
+            - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after InterruptedDueToStepDown"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 11602 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after NotMaster"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 10107 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after NotMasterNoSlaveOk"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 13435 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after NotMasterOrSecondary"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 13436 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after PrimarySteppedDown"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 189 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after ShutdownInProgress"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 91 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after HostNotFound"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 7 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after HostUnreachable"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 6 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after NetworkTimeout"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 89 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch succeeds after SocketException"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 9001 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch fails after two NotMaster errors"
+        failPoint:
+            <<: *failCommand_failPoint
+            mode: { times: 2 }
+            data: { failCommands: [aggregate], errorCode: 10107 }
+        operations:
+            - &retryable_operation_fails
+                <<: *retryable_operation
+                error: true
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch fails after NotMaster when retryReads is false"
+        clientOptions:
+            retryReads: false
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 10107 }
+        operations: [*retryable_operation_fails]
+        expectations:
+             - *retryable_command_started_event

data/spec/spec_tests/data/retryable_reads/changeStreams-db.coll.watch.yml ADDED

@@ -0,0 +1,65 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+database_name: &database_name "retryable-reads-tests"
+collection_name: &collection_name "coll"
+data:
+    - {_id: 1, x: 11}
+tests:
+    -
+        description: "db.coll.watch succeeds on first attempt"
+        operations:
+            - &retryable_operation
+                name: watch
+                object: collection
+        expectations:
+            - &retryable_command_started_event
+                command_started_event:
+                    command:
+                        aggregate: *collection_name
+                        cursor: {}
+                        pipeline: [ { $changeStream: { fullDocument: "default" } } ]
+                    database_name: *database_name
+    -
+        description: "db.coll.watch succeeds on second attempt"
+        failPoint:  &failCommand_failPoint
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands:
+                        - aggregate
+                closeConnection: true
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch fails on first attempt"
+        clientOptions:
+            retryReads: false
+        failPoint: *failCommand_failPoint
+        operations:
+            - &retryable_operation_fails
+                <<: *retryable_operation
+                error: true
+        expectations:
+             - *retryable_command_started_event
+    -
+        description: "db.coll.watch fails on second attempt"
+        failPoint:
+            <<: *failCommand_failPoint
+            mode: { times: 2 }
+        operations: [*retryable_operation_fails]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event

data/spec/spec_tests/data/retryable_reads/changeStreams-db.watch-serverErrors.yml ADDED

@@ -0,0 +1,153 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+database_name: &database_name "retryable-reads-tests"
+collection_name: &collection_name "coll"
+data:
+    - {_id: 1, x: 11}
+    - {_id: 2, x: 22}
+    - {_id: 3, x: 33}
+tests:
+    -
+        description: "db.watch succeeds after InterruptedAtShutdown"
+        failPoint: &failCommand_failPoint
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data: { failCommands: [aggregate], errorCode: 11600 }
+        operations:
+            - &retryable_operation
+                name: watch
+                object: database
+        expectations:
+            - &retryable_command_started_event
+                command_started_event:
+                    command:
+                        aggregate: 1
+                        cursor: {}
+                        pipeline: [ { $changeStream: { fullDocument: "default" } } ]
+                    database_name: *database_name
+            - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after InterruptedDueToStepDown"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 11602 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after NotMaster"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 10107 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after NotMasterNoSlaveOk"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 13435 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after NotMasterOrSecondary"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 13436 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after PrimarySteppedDown"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 189 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after ShutdownInProgress"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 91 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after HostNotFound"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 7 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after HostUnreachable"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 6 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after NetworkTimeout"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 89 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch succeeds after SocketException"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 9001 }
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch fails after two NotMaster errors"
+        failPoint:
+            <<: *failCommand_failPoint
+            mode: { times: 2 }
+            data: { failCommands: [aggregate], errorCode: 10107 }
+        operations:
+            - &retryable_operation_fails
+                <<: *retryable_operation
+                error: true
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch fails after NotMaster when retryReads is false"
+        clientOptions:
+            retryReads: false
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [aggregate], errorCode: 10107 }
+        operations: [*retryable_operation_fails]
+        expectations:
+             - *retryable_command_started_event

data/spec/spec_tests/data/retryable_reads/changeStreams-db.watch.yml ADDED

@@ -0,0 +1,61 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+database_name: &database_name "retryable-reads-tests"
+collection_name: &collection_name "coll"
+data:
+    - {_id: 1, x: 11}
+tests:
+    -
+        description: "db.watch succeeds on first attempt"
+        operations:
+            - &retryable_operation
+                name: watch
+                object: database
+        expectations:
+            - &retryable_command_started_event
+                command_started_event:
+                    command:
+                        aggregate: 1
+                        cursor: {}
+                        pipeline: [ { $changeStream: { fullDocument: "default" } } ]
+                    database_name: *database_name
+    -
+        description: "db.watch succeeds on second attempt"
+        failPoint:  &failCommand_failPoint
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands: [aggregate]
+                closeConnection: true
+        operations: [*retryable_operation]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "db.watch fails on first attempt"
+        clientOptions:
+            retryReads: false
+        failPoint: *failCommand_failPoint
+        operations:
+            - &retryable_operation_fails
+                <<: *retryable_operation
+                error: true
+        expectations:
+             - *retryable_command_started_event
+    -
+        description: "db.watch fails on second attempt"
+        failPoint:
+            <<: *failCommand_failPoint
+            mode: { times: 2 }
+        operations: [*retryable_operation_fails]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event

data/spec/spec_tests/data/retryable_reads/count-serverErrors.yml ADDED

@@ -0,0 +1,150 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["single", "replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+database_name: &database_name "retryable-reads-tests"
+collection_name: &collection_name "coll"
+data:
+    - { _id: 1, x: 11 }
+    - { _id: 2, x: 22 }
+tests:
+    -
+        description: "Count succeeds after InterruptedAtShutdown"
+        failPoint: &failCommand_failPoint
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data: { failCommands: [count], errorCode: 11600 }
+        operations:
+            - &retryable_operation_succeeds
+                <<: &retryable_operation
+                    name: count
+                    object: collection
+                    arguments: { filter: { } }
+                result: 2
+        expectations:
+            - &retryable_command_started_event
+                command_started_event:
+                    command:
+                        count: *collection_name
+                    database_name: *database_name
+            - *retryable_command_started_event
+    -
+        description: "Count succeeds after InterruptedDueToStepDown"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 11602 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after NotMaster"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 10107 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after NotMasterNoSlaveOk"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 13435 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after NotMasterOrSecondary"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 13436 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after PrimarySteppedDown"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 189 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after ShutdownInProgress"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 91 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after HostNotFound"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 7 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after HostUnreachable"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 6 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after NetworkTimeout"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 89 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count succeeds after SocketException"
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 9001 }
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count fails after two NotMaster errors"
+        failPoint:
+            <<: *failCommand_failPoint
+            mode: { times: 2 }
+            data: { failCommands: [count], errorCode: 10107 }
+        operations:
+            - &retryable_operation_fails
+                <<: *retryable_operation
+                error: true
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "Count fails after NotMaster when retryReads is false"
+        clientOptions:
+            retryReads: false
+        failPoint:
+            <<: *failCommand_failPoint
+            data: { failCommands: [count], errorCode: 10107 }
+        operations: [*retryable_operation_fails]
+        expectations:
+             - *retryable_command_started_event