Skip to content

DRIVERS-2799: Use more permissive top-level runOnRequirements #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmikola merged 2 commits into from
Dec 20, 2023
Merged

DRIVERS-2799: Use more permissive top-level runOnRequirements #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d3345
DRIVERS-2799: Use more permissive top-level runOnRequirements
jmikola Dec 19, 2023
e2add3a
Add RetryableWriteError error label via failCommand fail point
jmikola Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions source/retryable-writes/tests/unified/bulkWrite-serverErrors.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions source/retryable-writes/tests/unified/bulkWrite-serverErrors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ description: "retryable-writes bulkWrite serverErrors"
schemaVersion: "1.0"

runOnRequirements:
- minServerVersion: "3.6"
- minServerVersion: "4.0"
topologies: [ replicaset ]
- minServerVersion: "4.1.7"
topologies: [ sharded ]

createEntities:
- client:
Expand All @@ -29,11 +31,6 @@ initialData:

tests:
- description: "BulkWrite succeeds after retryable writeConcernError in first batch"
runOnRequirements:
- minServerVersion: "4.0"
topologies: [ replicaset ]
- minServerVersion: "4.1.7"
topologies: [ sharded ]
operations:
- name: failPoint
object: testRunner
Expand Down
22 changes: 7 additions & 15 deletions source/retryable-writes/tests/unified/insertOne-serverErrors.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions source/retryable-writes/tests/unified/insertOne-serverErrors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ description: "retryable-writes insertOne serverErrors"
schemaVersion: "1.0"

runOnRequirements:
- minServerVersion: "3.6"
- minServerVersion: "4.0"
topologies: [ replicaset ]
- minServerVersion: "4.1.7"
topologies: [ sharded ]

createEntities:
- client:
Expand All @@ -29,11 +31,6 @@ initialData:

tests:
- description: "InsertOne succeeds after retryable writeConcernError"
runOnRequirements:
- minServerVersion: "4.0"
topologies: [ replicaset ]
- minServerVersion: "4.1.7"
topologies: [ sharded ]
operations:
- name: failPoint
object: testRunner
Expand Down
35 changes: 27 additions & 8 deletions source/unified-test-format/tests/valid-pass/poc-retryable-writes.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions source/unified-test-format/tests/valid-pass/poc-retryable-writes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ description: "poc-retryable-writes"

schemaVersion: "1.0"

runOnRequirements:
- minServerVersion: "3.6"
topologies: [ replicaset ]

createEntities:
- client:
id: &client0 client0
Expand Down Expand Up @@ -42,6 +38,9 @@ initialData:

tests:
- description: "FindOneAndUpdate is committed on first attempt"
runOnRequirements: &onPrimaryTransactionalWrite_requirements
- minServerVersion: "3.6"
topologies: [ replicaset ]
operations:
- name: failPoint
object: testRunner
Expand All @@ -65,6 +64,7 @@ tests:
- { _id: 2, x: 22 }

- description: "FindOneAndUpdate is not committed on first attempt"
runOnRequirements: *onPrimaryTransactionalWrite_requirements
operations:
- name: failPoint
object: testRunner
Expand All @@ -89,6 +89,7 @@ tests:
- { _id: 2, x: 22 }

- description: "FindOneAndUpdate is never committed"
runOnRequirements: *onPrimaryTransactionalWrite_requirements
operations:
- name: failPoint
object: testRunner
Expand Down Expand Up @@ -190,6 +191,7 @@ tests:
mode: { times: 2 }
data:
failCommands: [ insert ]
errorLabels: [ RetryableWriteError ]
writeConcernError:
code: 91 # ShutdownInProgress
errmsg: "Replication is being shut down"
Expand Down