Skip to content

GODRIVER-2838 Deprecate sharded-replicaset topology type and clean up redundant runOnRequirements #1825

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
Sep 25, 2024
Merged

GODRIVER-2838 Deprecate sharded-replicaset topology type and clean up redundant runOnRequirements #1825

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
0a0e0f2
update tests
joyjwang Sep 20, 2024
70b807f
more test updates
joyjwang Sep 23, 2024
ff7badd
alter runCommand spec tests based on related ticket DRIVERS-2675
joyjwang Sep 23, 2024
3e4c14d
remove sessions-override-timeoutMS tests due to no support for defaul…
joyjwang Sep 23, 2024
95e3b21
remove new tests for legacy-timeouts
joyjwang Sep 23, 2024
f36c529
revert back to minServerVersion 4.9 for command-execution
joyjwang Sep 23, 2024
502386d
revert changes to command-execution
joyjwang Sep 23, 2024
b2f30bd
remove tests
joyjwang Sep 23, 2024
05f3759
remove change-streams.json
joyjwang Sep 23, 2024
0606839
remove all new tests
joyjwang Sep 24, 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
1 change: 0 additions & 1 deletion testdata/change-streams/change-streams-clusterTime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"minServerVersion": "4.0.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"load-balanced",
"sharded"
],
Expand Down
2 changes: 1 addition & 1 deletion testdata/change-streams/change-streams-clusterTime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ createEntities:

runOnRequirements:
- minServerVersion: "4.0.0"
topologies: [ replicaset, sharded-replicaset, load-balanced, sharded ]
topologies: [ replicaset, load-balanced, sharded ]
serverless: forbid

initialData:
Expand Down
2 changes: 0 additions & 2 deletions testdata/change-streams/change-streams-disambiguatedPaths.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"minServerVersion": "6.1.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"load-balanced",
"sharded"
],
Expand Down Expand Up @@ -250,4 +249,3 @@
}
]
}

3 changes: 1 addition & 2 deletions testdata/change-streams/change-streams-disambiguatedPaths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ createEntities:

runOnRequirements:
- minServerVersion: "6.1.0"
topologies: [ replicaset, sharded-replicaset, load-balanced, sharded ]
topologies: [ replicaset, load-balanced, sharded ]
serverless: forbid

initialData:
Expand Down Expand Up @@ -101,4 +101,3 @@ tests:
removedFields: { $$exists: true }
truncatedArrays: { $$exists: true }
disambiguatedPaths: { 'a.0.1': ['a', { $$type: 'int' }, '1'] }

4 changes: 2 additions & 2 deletions testdata/change-streams/change-streams-errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"minServerVersion": "4.1.11",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
]
}
Expand Down Expand Up @@ -190,7 +190,7 @@
"minServerVersion": "4.2",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
]
}
Expand Down
4 changes: 2 additions & 2 deletions testdata/change-streams/change-streams-errors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ tests:
- description: Change Stream should error when _id is projected out
runOnRequirements:
- minServerVersion: "4.1.11"
topologies: [ replicaset, sharded-replicaset, load-balanced ]
topologies: [ replicaset, sharded, load-balanced ]
operations:
- name: createChangeStream
object: *collection0
Expand All @@ -93,7 +93,7 @@ tests:
- description: change stream errors on ElectionInProgress
runOnRequirements:
- minServerVersion: "4.2"
topologies: [ replicaset, sharded-replicaset, load-balanced ]
topologies: [ replicaset, sharded, load-balanced ]
operations:
- name: failPoint
object: testRunner
Expand Down
2 changes: 1 addition & 1 deletion testdata/change-streams/change-streams-pre_and_post_images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minServerVersion": "6.0.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
],
"serverless": "forbid"
Expand Down
2 changes: 1 addition & 1 deletion testdata/change-streams/change-streams-pre_and_post_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ schemaVersion: "1.4"

runOnRequirements:
- minServerVersion: "6.0.0"
topologies: [ replicaset, sharded-replicaset, load-balanced ]
topologies: [ replicaset, sharded, load-balanced ]
serverless: forbid

createEntities:
Expand Down
2 changes: 1 addition & 1 deletion testdata/change-streams/change-streams-resume-allowlist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minServerVersion": "3.6",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
],
"serverless": "forbid"
Expand Down
2 changes: 1 addition & 1 deletion testdata/change-streams/change-streams-resume-allowlist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ schemaVersion: "1.7"

runOnRequirements:
- minServerVersion: "3.6"
topologies: [ replicaset, sharded-replicaset, load-balanced ]
topologies: [ replicaset, sharded, load-balanced ]
serverless: forbid

createEntities:
Expand Down
10 changes: 5 additions & 5 deletions testdata/change-streams/change-streams-resume-errorLabels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minServerVersion": "4.3.1",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
],
"serverless": "forbid"
Expand Down Expand Up @@ -1479,10 +1479,10 @@
{
"description": "change stream resumes after StaleShardVersion",
"runOnRequirements": [
{
"maxServerVersion": "6.0.99"
}
],
{
"maxServerVersion": "6.0.99"
}
],
"operations": [
{
"name": "failPoint",
Expand Down
6 changes: 3 additions & 3 deletions testdata/change-streams/change-streams-resume-errorLabels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ schemaVersion: "1.7"

runOnRequirements:
- minServerVersion: "4.3.1"
topologies: [ replicaset, sharded-replicaset, load-balanced ]
topologies: [ replicaset, sharded, load-balanced ]
serverless: forbid

createEntities:
Expand Down Expand Up @@ -744,8 +744,8 @@ tests:

- description: change stream resumes after StaleShardVersion
runOnRequirements:
# StaleShardVersion is obsolete as of 6.1 and is no longer marked as resumable.
- maxServerVersion: "6.0.99"
# StaleShardVersion is obsolete as of 6.1 and is no longer marked as resumable.
- maxServerVersion: "6.0.99"
operations:
- name: failPoint
object: testRunner
Expand Down
5 changes: 2 additions & 3 deletions testdata/change-streams/change-streams-showExpandedEvents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"minServerVersion": "6.0.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded"
]
],
"serverless": "forbid"
}
],
"createEntities": [
Expand Down Expand Up @@ -462,7 +462,6 @@
"runOnRequirements": [
{
"topologies": [
"sharded-replicaset",
"sharded"
]
}
Expand Down
6 changes: 4 additions & 2 deletions testdata/change-streams/change-streams-showExpandedEvents.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ description: "change-streams-showExpandedEvents"
schemaVersion: "1.7"
runOnRequirements:
- minServerVersion: "6.0.0"
topologies: [ replicaset, sharded-replicaset, sharded ]
topologies: [ replicaset, sharded ]
serverless: forbid
createEntities:
- client:
id: &client0 client0
Expand Down Expand Up @@ -275,7 +276,8 @@ tests:

- description: "when showExpandedEvents is true, shardCollection events are reported"
runOnRequirements:
- topologies: [ sharded-replicaset, sharded ]
# Note: minServerVersion is specified in top-level runOnRequirements
- topologies: [ sharded ]
operations:
- name: dropCollection
object: *shardedDb
Expand Down
1 change: 0 additions & 1 deletion testdata/client-side-operations-timeout/command-execution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"topologies": [
"single",
"replicaset",
"sharded-replicaset",
"sharded"
],
"serverless": "forbid"
Expand Down
3 changes: 1 addition & 2 deletions testdata/client-side-operations-timeout/error-transformations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
{
"minServerVersion": "4.2",
"topologies": [
"replicaset",
"sharded"
]
}
Expand All @@ -27,7 +26,7 @@
"client": {
"id": "client",
"uriOptions": {
"timeoutMS": 50
"timeoutMS": 250
Copy link
Member

Choose a reason for hiding this comment

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

It's interesting that this was missed in #1009

},
"useMultipleMongoses": false,
"observeEvents": [
Expand Down
4 changes: 2 additions & 2 deletions testdata/client-side-operations-timeout/error-transformations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runOnRequirements:
- minServerVersion: "4.0"
topologies: ["replicaset"]
- minServerVersion: "4.2"
topologies: ["replicaset", "sharded"]
topologies: ["sharded"]

createEntities:
- client:
Expand All @@ -16,7 +16,7 @@ createEntities:
- client:
id: &client client
uriOptions:
timeoutMS: 50
timeoutMS: 250
useMultipleMongoses: false
observeEvents:
- commandStartedEvent
Expand Down
Loading
Loading