Skip to content

DRIVERS-3261 Remove IndexNotFound error checks for dropIndex #1827

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
merged 10 commits into from
Aug 20, 2025
Merged

DRIVERS-3261 Remove IndexNotFound error checks for dropIndex #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3453592
Remove IndexNotFound-implicit errors
prestonvasquez Aug 13, 2025
37626b0
Generate JSON for removing IndexNotFound-implicit errors
prestonvasquez Aug 13, 2025
57879cc
Create index before dropping to avoid pre-latest IndexNotFound error
prestonvasquez Aug 13, 2025
6a3806b
Add createIndexes expected events
prestonvasquez Aug 13, 2025
39fc495
Ensure creatIndex does not time out for dropIndex tests
prestonvasquez Aug 13, 2025
8329c1c
Merge branch 'master' into task/drivers-3261-dropIndex-doesnt-return-…
prestonvasquez Aug 14, 2025
0c86f31
Add comments to createIndex operations
prestonvasquez Aug 14, 2025
e8d8abb
Avoid generating templates that couple create-to-drop indexes
prestonvasquez Aug 19, 2025
d5ca578
Update source/client-side-operations-timeout/tests/deprecated-options…
prestonvasquez Aug 19, 2025
05178c4
Run source/make
prestonvasquez Aug 19, 2025
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
43 changes: 24 additions & 19 deletions source/client-side-operations-timeout/etc/generate-basic-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# operations. Individual generation functions can choose to include them if needed.
OPERATIONS = CLIENT_OPERATIONS + DB_OPERATIONS + COLLECTION_OPERATIONS

RETRYABLE_WRITE_OPERATIONS = [op for op in OPERATIONS if op.operation_name in
RETRYABLE_WRITE_OPERATIONS = [op for op in OPERATIONS if op.operation_name in
['insertOne', 'updateOne', 'deleteOne', 'replaceOne', 'findOneAndDelete', 'findOneAndUpdate', 'findOneAndReplace', 'insertMany', 'bulkWrite']
]

Expand Down Expand Up @@ -102,28 +102,33 @@ def generate(name, operations):
}
write_yaml(name, template, injections)

def generate_global_timeout_tests():
generate('global-timeoutMS', OPERATIONS)

def generate_override_db():
generate('override-database-timeoutMS', DB_OPERATIONS + COLLECTION_OPERATIONS)

def generate_override_coll():
generate('override-collection-timeoutMS', COLLECTION_OPERATIONS)

def generate_override_operation():
generate('override-operation-timeoutMS', OPERATIONS)
# TODO(DRIVERS-3266): Investigate dropping generator script for index-related
# timeoutMS tests
#def generate_global_timeout_tests():
# generate('global-timeoutMS', OPERATIONS)
#
#def generate_override_db():
# generate('override-database-timeoutMS', DB_OPERATIONS + COLLECTION_OPERATIONS)
#
#def generate_override_coll():
# generate('override-collection-timeoutMS', COLLECTION_OPERATIONS)
#
#def generate_override_operation():
# generate('override-operation-timeoutMS', OPERATIONS)
#
#def generate_deprecated():
# generate('deprecated-options', OPERATIONS)

def generate_retryable():
generate('retryability-timeoutMS', RETRYABLE_WRITE_OPERATIONS + RETRYABLE_READ_OPERATIONS)
generate('retryability-legacy-timeouts', RETRYABLE_WRITE_OPERATIONS + RETRYABLE_READ_OPERATIONS)

def generate_deprecated():
generate('deprecated-options', OPERATIONS)
# TODO(DRIVERS-3266): Investigate dropping generator script for index-related
# timeoutMS tests
#generate_global_timeout_tests()
#generate_override_db()
#generate_override_coll()
#generate_override_operation()
#generate_deprecated()

generate_global_timeout_tests()
generate_override_db()
generate_override_coll()
generate_override_operation()
generate_retryable()
generate_deprecated()
67 changes: 55 additions & 12 deletions source/client-side-operations-timeout/tests/deprecated-options.json
View file
Open in desktop

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

54 changes: 40 additions & 14 deletions source/client-side-operations-timeout/tests/deprecated-options.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3743,16 +3743,19 @@ tests:
failCommands: ["dropIndexes"]
blockConnection: true
blockTimeMS: 5
# Create the index first so dropIndex doesn't return IndexNotFound on
# servers prior to 8.3.
- name: createIndex
object: *collection
arguments:
keys: { x: 1 }
timeoutMS: 100000
name: "x_1"
- name: dropIndex
object: *collection
arguments:
timeoutMS: 100000
name: "x_1"

expectError:
isClientError: false
isTimeoutError: false

- description: "wTimeoutMS is ignored if timeoutMS is set - dropIndex on collection"
operations:
- name: createEntities
Expand Down Expand Up @@ -3781,18 +3784,26 @@ tests:
- session:
id: &session session
client: *client
# Create the index first so dropIndex doesn't return IndexNotFound on
# servers prior to 8.3.
- name: createIndex
object: *collection
arguments:
keys: { x: 1 }
timeoutMS: 100000
name: "x_1"
- name: dropIndex
object: *collection
arguments:
timeoutMS: 100000
name: "x_1"

expectError:
isClientError: false
isTimeoutError: false
expectEvents:
- client: *client
events:
- commandStartedEvent:
commandName: createIndexes
databaseName: *databaseName

- commandStartedEvent:
commandName: dropIndexes
databaseName: *databaseName
Expand Down Expand Up @@ -3828,19 +3839,26 @@ tests:
- session:
id: &session session
client: *client
# Create the index first so dropIndex doesn't return IndexNotFound on
# servers prior to 8.3.
- name: createIndex
object: *collection
arguments:
keys: { x: 1 }
name: "x_1"
- name: dropIndex
object: *collection
arguments:
timeoutMS: &timeoutMS 1000
maxTimeMS: 5000
name: "x_1"

expectError:
isClientError: false
isTimeoutError: false
expectEvents:
- client: *client
events:
- commandStartedEvent:
commandName: createIndexes
databaseName: *databaseName

- commandStartedEvent:
commandName: dropIndexes
databaseName: *databaseName
Expand Down Expand Up @@ -3884,6 +3902,14 @@ tests:
failCommands: ["dropIndexes"]
blockConnection: true
blockTimeMS: 5
# Create the index first so dropIndex doesn't return IndexNotFound on
# servers prior to 8.3.
- name: createIndex
object: *collection
arguments:
keys: { x: 1 }
name: "x_1"
timeoutMS: 100000
- name: dropIndexes
object: *collection
arguments:
Expand Down Expand Up @@ -3979,4 +4005,4 @@ tests:
command:
dropIndexes: *collectionName
maxTimeMS: { $$lte: *timeoutMS }


20 changes: 16 additions & 4 deletions source/client-side-operations-timeout/tests/global-timeoutMS.json
View file
Open in desktop

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

17 changes: 12 additions & 5 deletions source/client-side-operations-timeout/tests/global-timeoutMS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3120,17 +3120,24 @@ tests:
failCommands: ["dropIndexes"]
blockConnection: true
blockTimeMS: 15
# Create the index first so dropIndex doesn't return IndexNotFound on
# servers prior to 8.3.
- name: createIndex
object: *collection
arguments:
keys: { x: 1 }
name: "x_1"
- name: dropIndex
object: *collection
arguments:
name: "x_1"

expectError:
isClientError: false
isTimeoutError: false
expectEvents:
- client: *client
events:
- commandStartedEvent:
commandName: createIndexes
databaseName: *databaseName

- commandStartedEvent:
commandName: dropIndexes
databaseName: *databaseName
Expand Down Expand Up @@ -3233,4 +3240,4 @@ tests:
command:
dropIndexes: *collectionName
maxTimeMS: { $$exists: false }


Loading
Loading