Skip to content

Commit ff1792e

Browse files
joyjwangjoyjwang
authored
GODRIVER-2838 Deprecate sharded-replicaset topology type and clean up redundant runOnRequirements (#1825)
1 parent 7ba70db commit ff1792e

File tree

51 files changed

+1895
-421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1895
-421
lines changed

‎testdata/change-streams/change-streams-clusterTime.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"minServerVersion": "4.0.0",
2929
"topologies": [
3030
"replicaset",
31-
"sharded-replicaset",
3231
"load-balanced",
3332
"sharded"
3433
],

‎testdata/change-streams/change-streams-clusterTime.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ createEntities:
1515

1616
runOnRequirements:
1717
- minServerVersion: "4.0.0"
18-
topologies: [ replicaset, sharded-replicaset, load-balanced, sharded ]
18+
topologies: [ replicaset, load-balanced, sharded ]
1919
serverless: forbid
2020

2121
initialData:

‎testdata/change-streams/change-streams-disambiguatedPaths.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"minServerVersion": "6.1.0",
2929
"topologies": [
3030
"replicaset",
31-
"sharded-replicaset",
3231
"load-balanced",
3332
"sharded"
3433
],
@@ -250,4 +249,3 @@
250249
}
251250
]
252251
}
253-

‎testdata/change-streams/change-streams-disambiguatedPaths.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ createEntities:
1515

1616
runOnRequirements:
1717
- minServerVersion: "6.1.0"
18-
topologies: [ replicaset, sharded-replicaset, load-balanced, sharded ]
18+
topologies: [ replicaset, load-balanced, sharded ]
1919
serverless: forbid
2020

2121
initialData:
@@ -101,4 +101,3 @@ tests:
101101
removedFields: { $$exists: true }
102102
truncatedArrays: { $$exists: true }
103103
disambiguatedPaths: { 'a.0.1': ['a', { $$type: 'int' }, '1'] }
104-

‎testdata/change-streams/change-streams-errors.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"minServerVersion": "4.1.11",
146146
"topologies": [
147147
"replicaset",
148-
"sharded-replicaset",
148+
"sharded",
149149
"load-balanced"
150150
]
151151
}
@@ -190,7 +190,7 @@
190190
"minServerVersion": "4.2",
191191
"topologies": [
192192
"replicaset",
193-
"sharded-replicaset",
193+
"sharded",
194194
"load-balanced"
195195
]
196196
}

‎testdata/change-streams/change-streams-errors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ tests:
7474
- description: Change Stream should error when _id is projected out
7575
runOnRequirements:
7676
- minServerVersion: "4.1.11"
77-
topologies: [ replicaset, sharded-replicaset, load-balanced ]
77+
topologies: [ replicaset, sharded, load-balanced ]
7878
operations:
7979
- name: createChangeStream
8080
object: *collection0
@@ -93,7 +93,7 @@ tests:
9393
- description: change stream errors on ElectionInProgress
9494
runOnRequirements:
9595
- minServerVersion: "4.2"
96-
topologies: [ replicaset, sharded-replicaset, load-balanced ]
96+
topologies: [ replicaset, sharded, load-balanced ]
9797
operations:
9898
- name: failPoint
9999
object: testRunner

‎testdata/change-streams/change-streams-pre_and_post_images.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"minServerVersion": "6.0.0",
77
"topologies": [
88
"replicaset",
9-
"sharded-replicaset",
9+
"sharded",
1010
"load-balanced"
1111
],
1212
"serverless": "forbid"

‎testdata/change-streams/change-streams-pre_and_post_images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ schemaVersion: "1.4"
44

55
runOnRequirements:
66
- minServerVersion: "6.0.0"
7-
topologies: [ replicaset, sharded-replicaset, load-balanced ]
7+
topologies: [ replicaset, sharded, load-balanced ]
88
serverless: forbid
99

1010
createEntities:

‎testdata/change-streams/change-streams-resume-allowlist.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"minServerVersion": "3.6",
77
"topologies": [
88
"replicaset",
9-
"sharded-replicaset",
9+
"sharded",
1010
"load-balanced"
1111
],
1212
"serverless": "forbid"

‎testdata/change-streams/change-streams-resume-allowlist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ schemaVersion: "1.7"
55

66
runOnRequirements:
77
- minServerVersion: "3.6"
8-
topologies: [ replicaset, sharded-replicaset, load-balanced ]
8+
topologies: [ replicaset, sharded, load-balanced ]
99
serverless: forbid
1010

1111
createEntities:

‎testdata/change-streams/change-streams-resume-errorLabels.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"minServerVersion": "4.3.1",
77
"topologies": [
88
"replicaset",
9-
"sharded-replicaset",
9+
"sharded",
1010
"load-balanced"
1111
],
1212
"serverless": "forbid"
@@ -1479,10 +1479,10 @@
14791479
{
14801480
"description": "change stream resumes after StaleShardVersion",
14811481
"runOnRequirements": [
1482-
{
1483-
"maxServerVersion": "6.0.99"
1484-
}
1485-
],
1482+
{
1483+
"maxServerVersion": "6.0.99"
1484+
}
1485+
],
14861486
"operations": [
14871487
{
14881488
"name": "failPoint",

‎testdata/change-streams/change-streams-resume-errorLabels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ schemaVersion: "1.7"
55

66
runOnRequirements:
77
- minServerVersion: "4.3.1"
8-
topologies: [ replicaset, sharded-replicaset, load-balanced ]
8+
topologies: [ replicaset, sharded, load-balanced ]
99
serverless: forbid
1010

1111
createEntities:
@@ -744,8 +744,8 @@ tests:
744744

745745
- description: change stream resumes after StaleShardVersion
746746
runOnRequirements:
747-
# StaleShardVersion is obsolete as of 6.1 and is no longer marked as resumable.
748-
- maxServerVersion: "6.0.99"
747+
# StaleShardVersion is obsolete as of 6.1 and is no longer marked as resumable.
748+
- maxServerVersion: "6.0.99"
749749
operations:
750750
- name: failPoint
751751
object: testRunner

‎testdata/change-streams/change-streams-showExpandedEvents.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"minServerVersion": "6.0.0",
77
"topologies": [
88
"replicaset",
9-
"sharded-replicaset",
109
"sharded"
11-
]
10+
],
11+
"serverless": "forbid"
1212
}
1313
],
1414
"createEntities": [
@@ -462,7 +462,6 @@
462462
"runOnRequirements": [
463463
{
464464
"topologies": [
465-
"sharded-replicaset",
466465
"sharded"
467466
]
468467
}

‎testdata/change-streams/change-streams-showExpandedEvents.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ description: "change-streams-showExpandedEvents"
22
schemaVersion: "1.7"
33
runOnRequirements:
44
- minServerVersion: "6.0.0"
5-
topologies: [ replicaset, sharded-replicaset, sharded ]
5+
topologies: [ replicaset, sharded ]
6+
serverless: forbid
67
createEntities:
78
- client:
89
id: &client0 client0
@@ -275,7 +276,8 @@ tests:
275276

276277
- description: "when showExpandedEvents is true, shardCollection events are reported"
277278
runOnRequirements:
278-
- topologies: [ sharded-replicaset, sharded ]
279+
# Note: minServerVersion is specified in top-level runOnRequirements
280+
- topologies: [ sharded ]
279281
operations:
280282
- name: dropCollection
281283
object: *shardedDb

‎testdata/client-side-operations-timeout/command-execution.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"topologies": [
88
"single",
99
"replicaset",
10-
"sharded-replicaset",
1110
"sharded"
1211
],
1312
"serverless": "forbid"

‎testdata/client-side-operations-timeout/error-transformations.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
{
1212
"minServerVersion": "4.2",
1313
"topologies": [
14-
"replicaset",
1514
"sharded"
1615
]
1716
}
@@ -27,7 +26,7 @@
2726
"client": {
2827
"id": "client",
2928
"uriOptions": {
30-
"timeoutMS": 50
29+
"timeoutMS": 250
3130
},
3231
"useMultipleMongoses": false,
3332
"observeEvents": [

‎testdata/client-side-operations-timeout/error-transformations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runOnRequirements:
77
- minServerVersion: "4.0"
88
topologies: ["replicaset"]
99
- minServerVersion: "4.2"
10-
topologies: ["replicaset", "sharded"]
10+
topologies: ["sharded"]
1111

1212
createEntities:
1313
- client:
@@ -16,7 +16,7 @@ createEntities:
1616
- client:
1717
id: &client client
1818
uriOptions:
19-
timeoutMS: 50
19+
timeoutMS: 250
2020
useMultipleMongoses: false
2121
observeEvents:
2222
- commandStartedEvent

0 commit comments

Comments
 (0)