Skip to content
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

Jump to bottom

DRIVERS-2871 CSOT tests: Expect withTransaction to propagate errors #1553

Merged
merged 1 commit into from
May 2, 2024
Merged

DRIVERS-2871 CSOT tests: Expect withTransaction to propagate errors #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions source/client-side-operations-timeout/tests/convenient-transactions.json
View file
Open in desktop

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

11 changes: 8 additions & 3 deletions source/client-side-operations-timeout/tests/convenient-transactions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ tests:
timeoutMS: 100
expectError:
isClientError: true
expectError:
isClientError: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In PyMongo (and Go) the "expectError" on the insertOne above causes the test runner to catch, validate, and the ignore the exception so it never reaches the withTransaction block. So this new test would fail. Is it a bug that Java propagates the exception?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see. This was recently changed in https://jira.mongodb.org/browse/DRIVERS-1709 but wasn't documented in the UTR spec itself. The only reference is in the jira ticket:

Ensure that neither ignoreResultAndError nor expectError interfere with propagating exceptions from a callback operation to withTransaction. This came up with the Java driver's POC.

Copy link
Member

@ShaneHarvey ShaneHarvey Mar 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I was looking at the old RST version. It is documented in the markdown version: https://github.com/mongodb/specifications/blob/master/source/unified-test-format/unified-test-format.md#withtransaction

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify was this change correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this change is correct given the new rules for handling errors in the UTR.

expectEvents:
# The only operation run fails with a client-side error, so there should be no events for the client.
- client: *client
Expand Down Expand Up @@ -88,9 +90,6 @@ tests:
expectEvents:
- client: *client
events:
# Because the second insert expects an error and gets an error, it technically succeeds, so withTransaction
# will try to run commitTransaction. This will fail client-side, though, because the timeout has already
# expired, so no command is sent.
- commandStartedEvent:
commandName: insert
databaseName: *databaseName
Expand All @@ -103,3 +102,9 @@ tests:
command:
insert: *collectionName
maxTimeMS: { $$type: ["int", "long"] }
- commandStartedEvent:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As withTransaction expects an error, then an abortTransaction event will be issued.

commandName: abortTransaction
databaseName: admin
command:
abortTransaction: 1
maxTimeMS: { $$type: [ "int", "long" ] }
20 changes: 20 additions & 0 deletions source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.json
View file
Open in desktop

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

11 changes: 8 additions & 3 deletions source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@ tests:
expectEvents:
- client: *client
events:
# Because the insert expects an error and gets an error, it technically succeeds, so withTransaction will
# try to run commitTransaction. This will fail client-side, though, because the timeout has already expired,
# so no command is sent.
- commandStartedEvent:
commandName: insert
databaseName: *databaseName
Expand All @@ -166,3 +163,11 @@ tests:
maxTimeMS: { $$type: ["int", "long"] }
- commandFailedEvent:
commandName: insert
- commandStartedEvent:
commandName: abortTransaction
databaseName: admin
command:
abortTransaction: 1
maxTimeMS: { $$type: [ "int", "long" ] }
- commandFailedEvent:
commandName: abortTransaction
20 changes: 20 additions & 0 deletions source/client-side-operations-timeout/tests/sessions-override-operation-timeoutMS.json
View file
Open in desktop

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

11 changes: 8 additions & 3 deletions source/client-side-operations-timeout/tests/sessions-override-operation-timeoutMS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ tests:
expectEvents:
- client: *client
events:
# Because the insert expects an error and gets an error, it technically succeeds, so withTransaction will
# try to run commitTransaction. This will fail client-side, though, because the timeout has already expired,
# so no command is sent.
- commandStartedEvent:
commandName: insert
databaseName: *databaseName
Expand All @@ -169,3 +166,11 @@ tests:
maxTimeMS: { $$type: ["int", "long"] }
- commandFailedEvent:
commandName: insert
- commandStartedEvent:
commandName: abortTransaction
databaseName: admin
command:
abortTransaction: 1
maxTimeMS: { $$type: ["int", "long"] }
- commandFailedEvent:
commandName: abortTransaction
20 changes: 20 additions & 0 deletions source/client-side-operations-timeout/tests/sessions-override-timeoutMS.json
View file
Open in desktop

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

11 changes: 8 additions & 3 deletions source/client-side-operations-timeout/tests/sessions-override-timeoutMS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@ tests:
expectEvents:
- client: *client
events:
# Because the insert expects an error and gets an error, it technically succeeds, so withTransaction will
# try to run commitTransaction. This will fail client-side, though, because the timeout has already expired,
# so no command is sent.
- commandStartedEvent:
commandName: insert
databaseName: *databaseName
Expand All @@ -166,3 +163,11 @@ tests:
maxTimeMS: { $$type: ["int", "long"] }
- commandFailedEvent:
commandName: insert
- commandStartedEvent:
commandName: abortTransaction
databaseName: admin
command:
abortTransaction: 1
maxTimeMS: { $$type: [ "int", "long" ] }
- commandFailedEvent:
commandName: abortTransaction
Loading