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.

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

feat(NODE-6390): Add timeoutMS support to auto encryption #4265

Merged
merged 150 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
3c2ec0a
feat(NODE-6090): Implement CSOT logic for connection checkout and ser…
W-A-James Apr 11, 2024
909578f
test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)
W-A-James Jun 10, 2024
e101750
refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)
W-A-James Jun 21, 2024
e4efd3f
refactor(NODE-6230): executeOperation to use iterative retry mechanis…
nbbeeken Jul 22, 2024
22082c9
feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)
nbbeeken Jul 26, 2024
bf95fa4
feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…
W-A-James Aug 1, 2024
c63d102
feat(NODE-6312): add error transformation for server timeouts (#4192)
nbbeeken Aug 12, 2024
1eab23d
feat(NODE-6313): add CSOT support to sessions and transactions (#4199)
nbbeeken Sep 9, 2024
4c4b0a9
feat(NODE-6304): add CSOT support for non-tailable cursors (#4195)
W-A-James Sep 12, 2024
558d416
fix(NODE-6374): MongoOperationTimeoutError inherits MongoRuntimeError…
nbbeeken Sep 12, 2024
3ed4a14
test: remove empty skipped context blocks (#4238)
W-A-James Sep 12, 2024
d3438ea
feat(NODE-5844): add iscryptd to ServerDescription (#4239)
nbbeeken Sep 17, 2024
ff561e3
temp
aditi-khare-mongoDB Sep 19, 2024
164780c
temp
aditi-khare-mongoDB Sep 20, 2024
12a7e2e
chore: plumb timeoutMS around more
nbbeeken Sep 24, 2024
999f23d
feat(NODE-6090): Implement CSOT logic for connection checkout and ser…
W-A-James Apr 11, 2024
0355404
test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)
W-A-James Jun 10, 2024
5ef3d69
refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)
W-A-James Jun 21, 2024
7139b8f
refactor(NODE-6230): executeOperation to use iterative retry mechanis…
nbbeeken Jul 22, 2024
acfb4fc
feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)
nbbeeken Jul 26, 2024
4efff95
feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…
W-A-James Aug 1, 2024
1997f81
feat(NODE-6312): add error transformation for server timeouts (#4192)
nbbeeken Aug 12, 2024
cc3ef8f
feat(NODE-6313): add CSOT support to sessions and transactions (#4199)
nbbeeken Sep 9, 2024
38affae
feat(NODE-6304): add CSOT support for non-tailable cursors (#4195)
W-A-James Sep 12, 2024
738188b
fix(NODE-6374): MongoOperationTimeoutError inherits MongoRuntimeError…
nbbeeken Sep 12, 2024
c4a7c2c
test: remove empty skipped context blocks (#4238)
W-A-James Sep 12, 2024
5aa6d4c
feat(NODE-5844): add iscryptd to ServerDescription (#4239)
nbbeeken Sep 17, 2024
17a2fde
chore: allow clientBulkWrite to use TimeoutContext (#4251)
W-A-James Sep 25, 2024
aead2f1
Merge branch 'NODE-6090' into NODE-6389
aditi-khare-mongoDB Sep 25, 2024
88ca990
half testing
aditi-khare-mongoDB Sep 26, 2024
2e3a84c
revert state machine test changes
aditi-khare-mongoDB Sep 30, 2024
8003163
feat(NODE-6090): Implement CSOT logic for connection checkout and ser…
W-A-James Apr 11, 2024
a216ae6
test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)
W-A-James Jun 10, 2024
aca9661
refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)
W-A-James Jun 21, 2024
3051def
refactor(NODE-6230): executeOperation to use iterative retry mechanis…
nbbeeken Jul 22, 2024
df025f4
feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)
nbbeeken Jul 26, 2024
83cd82b
feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…
W-A-James Aug 1, 2024
c36dce5
feat(NODE-6312): add error transformation for server timeouts (#4192)
nbbeeken Aug 12, 2024
3fe3e01
feat(NODE-6313): add CSOT support to sessions and transactions (#4199)
nbbeeken Sep 9, 2024
7b4aa84
feat(NODE-6304): add CSOT support for non-tailable cursors (#4195)
W-A-James Sep 12, 2024
3045a34
fix(NODE-6374): MongoOperationTimeoutError inherits MongoRuntimeError…
nbbeeken Sep 12, 2024
11d059f
test: remove empty skipped context blocks (#4238)
W-A-James Sep 12, 2024
bfeeda9
feat(NODE-5844): add iscryptd to ServerDescription (#4239)
nbbeeken Sep 17, 2024
7a12914
chore: allow clientBulkWrite to use TimeoutContext (#4251)
W-A-James Sep 25, 2024
e6e9fb4
requested changes
aditi-khare-mongoDB Oct 1, 2024
3dc383b
Merge branch 'NODE-6090' into NODE-6389
aditi-khare-mongoDB Oct 1, 2024
702a03e
lint fix
aditi-khare-mongoDB Oct 1, 2024
3b6a23b
test fix
aditi-khare-mongoDB Oct 1, 2024
5560a1b
no negative timeouts
aditi-khare-mongoDB Oct 2, 2024
be96466
feat(NODE-6390): Add timeoutMS support to auto encryption
aditi-khare-mongoDB Oct 2, 2024
09f6d7d
feat(NODE-6274): add CSOT support to bulkWrite (#4250)
nbbeeken Oct 2, 2024
601c159
requested changes
aditi-khare-mongoDB Oct 2, 2024
643e3a7
testing
aditi-khare-mongoDB Oct 3, 2024
096f154
fix failing tests
aditi-khare-mongoDB Oct 3, 2024
5aba790
requested changes 3
aditi-khare-mongoDB Oct 3, 2024
9684491
Merge branch 'NODE-6389' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 3, 2024
e06a553
temp
aditi-khare-mongoDB Oct 3, 2024
903e0d0
limit flaky tests
aditi-khare-mongoDB Oct 3, 2024
9a4dd7b
ready for review
aditi-khare-mongoDB Oct 4, 2024
1a06868
feat(NODE-6275): Add CSOT support to GridFS (#4246)
W-A-James Oct 4, 2024
709f725
Merge branch 'NODE-6090' into NODE-6389
aditi-khare-mongoDB Oct 4, 2024
a4fb3d0
fix revert
aditi-khare-mongoDB Oct 4, 2024
8e8bfb2
Merge branch 'NODE-6389' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 4, 2024
392599c
refactor(NODE-6411): AbstractCursor accepts an external timeout conte…
baileympearson Oct 4, 2024
cb12f64
lint fix
aditi-khare-mongoDB Oct 7, 2024
01aca89
Merge branch 'NODE-6090' into NODE-6389
baileympearson Oct 7, 2024
9a1b2d0
feat(NODE-6305): Add CSOT support to tailable cursors (#4218)
W-A-James Oct 7, 2024
6ea56d3
Merge branch 'NODE-6090' into NODE-6389
baileympearson Oct 7, 2024
842b52a
lint fix
aditi-khare-mongoDB Oct 4, 2024
9853403
Merge branch 'NODE-6389' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 7, 2024
d26a588
feat(NODE-6389): add support for timeoutMS in StateMachine.execute() …
aditi-khare-mongoDB Oct 7, 2024
8013fe5
ready for rebase
aditi-khare-mongoDB Oct 7, 2024
98c0f07
Merge branch 'NODE-6090' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 7, 2024
aab8e33
ready for review
aditi-khare-mongoDB Oct 7, 2024
cf8b0d8
remove extra change
aditi-khare-mongoDB Oct 7, 2024
24e0a35
remove extra change
aditi-khare-mongoDB Oct 7, 2024
6b89760
ready for review
aditi-khare-mongoDB Oct 8, 2024
9c478ab
only >4.2 servers
aditi-khare-mongoDB Oct 8, 2024
1d9034b
remove stray only
aditi-khare-mongoDB Oct 8, 2024
a31e7bf
feat(NODE-6090): Implement CSOT logic for connection checkout and ser…
W-A-James Apr 11, 2024
ecaedfa
test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)
W-A-James Jun 10, 2024
e04694c
refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)
W-A-James Jun 21, 2024
0a23f20
refactor(NODE-6230): executeOperation to use iterative retry mechanis…
nbbeeken Jul 22, 2024
f3e190f
feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)
nbbeeken Jul 26, 2024
61b2d80
feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…
W-A-James Aug 1, 2024
35a5eb4
feat(NODE-6312): add error transformation for server timeouts (#4192)
nbbeeken Aug 12, 2024
a9c9224
feat(NODE-6313): add CSOT support to sessions and transactions (#4199)
nbbeeken Sep 9, 2024
2b9ef6f
feat(NODE-6304): add CSOT support for non-tailable cursors (#4195)
W-A-James Sep 12, 2024
f38197b
fix(NODE-6374): MongoOperationTimeoutError inherits MongoRuntimeError…
nbbeeken Sep 12, 2024
607a53b
test: remove empty skipped context blocks (#4238)
W-A-James Sep 12, 2024
1ee3f6d
feat(NODE-5844): add iscryptd to ServerDescription (#4239)
nbbeeken Sep 17, 2024
bf2b4ac
chore: allow clientBulkWrite to use TimeoutContext (#4251)
W-A-James Sep 25, 2024
b159749
feat(NODE-6274): add CSOT support to bulkWrite (#4250)
nbbeeken Oct 2, 2024
3e2d32f
feat(NODE-6275): Add CSOT support to GridFS (#4246)
W-A-James Oct 4, 2024
faae6d5
refactor(NODE-6411): AbstractCursor accepts an external timeout conte…
baileympearson Oct 4, 2024
af6a4e2
feat(NODE-6305): Add CSOT support to tailable cursors (#4218)
W-A-James Oct 7, 2024
a645d9f
feat(NODE-6389): add support for timeoutMS in StateMachine.execute() …
aditi-khare-mongoDB Oct 7, 2024
c0d6ec9
fix(NODE-6412): read stale response from previously timed out connect…
nbbeeken Oct 11, 2024
7df1a70
feat(NODE-6403): add CSOT support to client bulk write (#4261)
baileympearson Oct 14, 2024
6330fd6
feat(NODE-6090): Implement CSOT logic for connection checkout and ser…
W-A-James Apr 11, 2024
a1206a0
test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)
W-A-James Jun 10, 2024
a47e280
refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)
W-A-James Jun 21, 2024
398066e
refactor(NODE-6230): executeOperation to use iterative retry mechanis…
nbbeeken Jul 22, 2024
c333723
feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)
nbbeeken Jul 26, 2024
256ca4e
feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…
W-A-James Aug 1, 2024
8a416be
feat(NODE-6312): add error transformation for server timeouts (#4192)
nbbeeken Aug 12, 2024
52c2c9d
feat(NODE-6313): add CSOT support to sessions and transactions (#4199)
nbbeeken Sep 9, 2024
546366f
feat(NODE-6304): add CSOT support for non-tailable cursors (#4195)
W-A-James Sep 12, 2024
4f8e7c9
fix(NODE-6374): MongoOperationTimeoutError inherits MongoRuntimeError…
nbbeeken Sep 12, 2024
8b9eeef
test: remove empty skipped context blocks (#4238)
W-A-James Sep 12, 2024
1eb0b74
feat(NODE-5844): add iscryptd to ServerDescription (#4239)
nbbeeken Sep 17, 2024
580130d
chore: allow clientBulkWrite to use TimeoutContext (#4251)
W-A-James Sep 25, 2024
2e93ce7
feat(NODE-6274): add CSOT support to bulkWrite (#4250)
nbbeeken Oct 2, 2024
c637ea8
feat(NODE-6275): Add CSOT support to GridFS (#4246)
W-A-James Oct 4, 2024
0bdb03f
Merge branch 'NODE-6090' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 14, 2024
c148f6b
refactor(NODE-6411): AbstractCursor accepts an external timeout conte…
baileympearson Oct 4, 2024
4488bab
feat(NODE-6305): Add CSOT support to tailable cursors (#4218)
W-A-James Oct 7, 2024
c28a365
feat(NODE-6389): add support for timeoutMS in StateMachine.execute() …
aditi-khare-mongoDB Oct 7, 2024
85d39ec
fix(NODE-6412): read stale response from previously timed out connect…
nbbeeken Oct 11, 2024
450b163
feat(NODE-6403): add CSOT support to client bulk write (#4261)
baileympearson Oct 14, 2024
ae2165d
Merge branch 'NODE-6090' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 14, 2024
dd8f4b2
add back newline
aditi-khare-mongoDB Oct 14, 2024
d773ae3
remove extra newline
aditi-khare-mongoDB Oct 14, 2024
d93b61a
more newline from rebase
aditi-khare-mongoDB Oct 14, 2024
05bee51
ci please work...
aditi-khare-mongoDB Oct 14, 2024
e58772b
delete extraneous folder
aditi-khare-mongoDB Oct 14, 2024
0296525
remove test with unclosed socket
aditi-khare-mongoDB Oct 15, 2024
6af0aa4
remove test with unclosed socket
aditi-khare-mongoDB Oct 15, 2024
0031477
remove misc change
aditi-khare-mongoDB Oct 15, 2024
f565e9f
fix metadata logic
aditi-khare-mongoDB Oct 15, 2024
15c3d72
fix skippes test rquirement
aditi-khare-mongoDB Oct 15, 2024
92cc6dd
lint fix
aditi-khare-mongoDB Oct 15, 2024
08056e8
final test..
aditi-khare-mongoDB Oct 15, 2024
fa66268
temp
aditi-khare-mongoDB Oct 15, 2024
f2572c9
requested changes
aditi-khare-mongoDB Oct 16, 2024
0dab0ca
lint
aditi-khare-mongoDB Oct 16, 2024
2a6a2d1
requested changes
aditi-khare-mongoDB Oct 17, 2024
9530160
drop collection
aditi-khare-mongoDB Oct 17, 2024
2088e63
test
aditi-khare-mongoDB Oct 21, 2024
313eaa0
feat(NODE-6403): add CSOT support to client bulk write (#4261)
baileympearson Oct 14, 2024
07cffc7
chore: fix a few flaky CSOT tests (#4278)
baileympearson Oct 17, 2024
c3f31da
feat(NODE-6421): add support for timeoutMS to explain helpers (#4268)
baileympearson Oct 21, 2024
b37eb63
Merge branch 'NODE-6090' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 21, 2024
5b1164f
added schmea map
aditi-khare-mongoDB Oct 21, 2024
186c059
Merge branch 'NODE-6090' into NODE-6390/auto-encryption-csot
aditi-khare-mongoDB Oct 21, 2024
aa9a077
requested changes
aditi-khare-mongoDB Oct 22, 2024
df6bb05
consolidate meta data
aditi-khare-mongoDB Oct 22, 2024
fec8887
fixed failing test
aditi-khare-mongoDB Oct 23, 2024
a0ebd93
lint fix
aditi-khare-mongoDB Oct 24, 2024
b56ced1
Merge branch 'NODE-6090' into NODE-6390/auto-encryption-csot
baileympearson Oct 25, 2024
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
8 changes: 6 additions & 2 deletions src/client-side-encryption/auto_encrypter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ export class AutoEncrypter {
socketOptions: autoSelectSocketOptions(this._client.options)
});

return deserialize(await stateMachine.execute(this, context), {
return deserialize(await stateMachine.execute(this, context, options.timeoutContext), {
promoteValues: false,
promoteLongs: false
});
Expand All @@ -416,7 +416,11 @@ export class AutoEncrypter {
socketOptions: autoSelectSocketOptions(this._client.options)
});

return await stateMachine.execute(this, context);
return await stateMachine.execute(
this,
context,
options.timeoutContext?.csotEnabled() ? options.timeoutContext : undefined
);
}

/**
Expand Down
Loading