Skip to content

Commit f98449a

Browse files
papafepapafe
committed
New tests from CSHARP-5924 and test name updates from DRIVERS-3416
1 parent 475b6d4 commit f98449a

8 files changed

Lines changed: 210 additions & 14 deletions

‎specifications/client-backpressure/tests/backpressure-connection-checkin.json‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
{
2+
"description": "tests that connections are returned to the pool on retry attempts for overload errors",
3+
"schemaVersion": "1.3",
4+
"runOnRequirements": [
5+
{
6+
"minServerVersion": "4.4",
7+
"topologies": [
8+
"replicaset",
9+
"sharded",
10+
"load-balanced"
11+
]
12+
}
13+
],
14+
"createEntities": [
15+
{
16+
"client": {
17+
"id": "client",
18+
"useMultipleMongoses": false,
19+
"observeEvents": [
20+
"connectionCheckedOutEvent",
21+
"connectionCheckedInEvent"
22+
]
23+
}
24+
},
25+
{
26+
"client": {
27+
"id": "fail_point_client",
28+
"useMultipleMongoses": false
29+
}
30+
},
31+
{
32+
"database": {
33+
"id": "database",
34+
"client": "client",
35+
"databaseName": "backpressure-connection-checkin"
36+
}
37+
},
38+
{
39+
"collection": {
40+
"id": "collection",
41+
"database": "database",
42+
"collectionName": "coll"
43+
}
44+
}
45+
],
46+
"tests": [
47+
{
48+
"description": "overload error retry attempts return connections to the pool",
49+
"operations": [
50+
{
51+
"name": "failPoint",
52+
"object": "testRunner",
53+
"arguments": {
54+
"client": "fail_point_client",
55+
"failPoint": {
56+
"configureFailPoint": "failCommand",
57+
"mode": "alwaysOn",
58+
"data": {
59+
"failCommands": [
60+
"find"
61+
],
62+
"errorLabels": [
63+
"RetryableError",
64+
"SystemOverloadedError"
65+
],
66+
"errorCode": 2
67+
}
68+
}
69+
}
70+
},
71+
{
72+
"name": "find",
73+
"object": "collection",
74+
"arguments": {
75+
"filter": {}
76+
},
77+
"expectError": {
78+
"isError": true,
79+
"isClientError": false
80+
}
81+
}
82+
],
83+
"expectEvents": [
84+
{
85+
"client": "client",
86+
"eventType": "cmap",
87+
"events": [
88+
{
89+
"connectionCheckedOutEvent": {}
90+
},
91+
{
92+
"connectionCheckedInEvent": {}
93+
},
94+
{
95+
"connectionCheckedOutEvent": {}
96+
},
97+
{
98+
"connectionCheckedInEvent": {}
99+
},
100+
{
101+
"connectionCheckedOutEvent": {}
102+
},
103+
{
104+
"connectionCheckedInEvent": {}
105+
},
106+
{
107+
"connectionCheckedOutEvent": {}
108+
},
109+
{
110+
"connectionCheckedInEvent": {}
111+
},
112+
{
113+
"connectionCheckedOutEvent": {}
114+
},
115+
{
116+
"connectionCheckedInEvent": {}
117+
},
118+
{
119+
"connectionCheckedOutEvent": {}
120+
},
121+
{
122+
"connectionCheckedInEvent": {}
123+
}
124+
]
125+
}
126+
]
127+
}
128+
]
129+
}

‎specifications/client-backpressure/tests/backpressure-connection-checkin.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
description: tests that connections are returned to the pool on retry attempts for overload errors
2+
schemaVersion: "1.3"
3+
runOnRequirements:
4+
- minServerVersion: "4.4"
5+
topologies:
6+
- replicaset
7+
- sharded
8+
- load-balanced
9+
createEntities:
10+
- client:
11+
id: client
12+
useMultipleMongoses: false
13+
observeEvents:
14+
- connectionCheckedOutEvent
15+
- connectionCheckedInEvent
16+
- client:
17+
id: fail_point_client
18+
useMultipleMongoses: false
19+
- database:
20+
id: database
21+
client: client
22+
databaseName: backpressure-connection-checkin
23+
- collection:
24+
id: collection
25+
database: database
26+
collectionName: coll
27+
tests:
28+
- description: overload error retry attempts return connections to the pool
29+
operations:
30+
- name: failPoint
31+
object: testRunner
32+
arguments:
33+
client: fail_point_client
34+
failPoint:
35+
configureFailPoint: failCommand
36+
mode: alwaysOn
37+
data:
38+
failCommands:
39+
- find
40+
errorLabels:
41+
- RetryableError
42+
- SystemOverloadedError
43+
errorCode: 2
44+
- name: find
45+
object: collection
46+
arguments:
47+
filter: {}
48+
expectError:
49+
isError: true
50+
isClientError: false
51+
expectEvents:
52+
- client: client
53+
eventType: cmap
54+
events:
55+
- connectionCheckedOutEvent: {}
56+
- connectionCheckedInEvent: {}
57+
- connectionCheckedOutEvent: {}
58+
- connectionCheckedInEvent: {}
59+
- connectionCheckedOutEvent: {}
60+
- connectionCheckedInEvent: {}
61+
- connectionCheckedOutEvent: {}
62+
- connectionCheckedInEvent: {}
63+
- connectionCheckedOutEvent: {}
64+
- connectionCheckedInEvent: {}
65+
- connectionCheckedOutEvent: {}
66+
- connectionCheckedInEvent: {}
67+

‎specifications/client-backpressure/tests/backpressure-retry-loop.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@
711711
]
712712
},
713713
{
714-
"description": "database.aggregate retries using operation loop",
714+
"description": "database.aggregate read retries using operation loop",
715715
"operations": [
716716
{
717717
"name": "failPoint",
@@ -1480,7 +1480,7 @@
14801480
]
14811481
},
14821482
{
1483-
"description": "collection.aggregate retries using operation loop",
1483+
"description": "collection.aggregate read retries using operation loop",
14841484
"operations": [
14851485
{
14861486
"name": "failPoint",
@@ -4734,7 +4734,7 @@
47344734
]
47354735
},
47364736
{
4737-
"description": "collection.aggregate retries using operation loop",
4737+
"description": "collection.aggregate write retries using operation loop",
47384738
"operations": [
47394739
{
47404740
"name": "failPoint",

‎specifications/client-backpressure/tests/backpressure-retry-loop.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ tests:
366366
commandName: bulkWrite
367367

368368

369-
- description: 'database.aggregate retries using operation loop'
369+
- description: 'database.aggregate read retries using operation loop'
370370
operations:
371371
- name: failPoint
372372
object: testRunner
@@ -743,7 +743,7 @@ tests:
743743
commandName: aggregate
744744

745745

746-
- description: 'collection.aggregate retries using operation loop'
746+
- description: 'collection.aggregate read retries using operation loop'
747747
operations:
748748
- name: failPoint
749749
object: testRunner
@@ -2344,7 +2344,7 @@ tests:
23442344
commandName: dropIndexes
23452345

23462346

2347-
- description: 'collection.aggregate retries using operation loop'
2347+
- description: 'collection.aggregate write retries using operation loop'
23482348
operations:
23492349
- name: failPoint
23502350
object: testRunner

‎specifications/client-backpressure/tests/backpressure-retry-loop.yml.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ _yamlAnchors:
8484
bulWriteInsertNamespace: &client_bulk_write_ns retryable-writes-tests.coll
8585

8686
tests: {% for operation in operations %}
87-
- description: '{{operation.object}}.{{operation.operation_name}} retries using operation loop' {%- if ((operation.operation_name == 'clientBulkWrite')) %}
87+
- description: '{{operation.object}}.{{operation.operation_name}}{{ " " + operation.operation_type + "" if operation.operation_name == "aggregate" else "" }} retries using operation loop' {%- if ((operation.operation_name == 'clientBulkWrite')) %}
8888
runOnRequirements:
8989
- minServerVersion: '8.0' # client bulk write added to server in 8.0
9090
{%- endif %}

‎specifications/client-backpressure/tests/backpressure-retry-max-attempts.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496
]
497497
},
498498
{
499-
"description": "database.aggregate retries at most maxAttempts=5 times",
499+
"description": "database.aggregate read retries at most maxAttempts=5 times",
500500
"operations": [
501501
{
502502
"name": "failPoint",
@@ -1026,7 +1026,7 @@
10261026
]
10271027
},
10281028
{
1029-
"description": "collection.aggregate retries at most maxAttempts=5 times",
1029+
"description": "collection.aggregate read retries at most maxAttempts=5 times",
10301030
"operations": [
10311031
{
10321032
"name": "failPoint",
@@ -3448,7 +3448,7 @@
34483448
]
34493449
},
34503450
{
3451-
"description": "collection.aggregate retries at most maxAttempts=5 times",
3451+
"description": "collection.aggregate write retries at most maxAttempts=5 times",
34523452
"operations": [
34533453
{
34543454
"name": "failPoint",

‎specifications/client-backpressure/tests/backpressure-retry-max-attempts.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ tests:
252252
- commandFailedEvent:
253253
commandName: bulkWrite
254254

255-
- description: 'database.aggregate retries at most maxAttempts=5 times'
255+
- description: 'database.aggregate read retries at most maxAttempts=5 times'
256256
operations:
257257
- name: failPoint
258258
object: testRunner
@@ -513,7 +513,7 @@ tests:
513513
- commandFailedEvent:
514514
commandName: aggregate
515515

516-
- description: 'collection.aggregate retries at most maxAttempts=5 times'
516+
- description: 'collection.aggregate read retries at most maxAttempts=5 times'
517517
operations:
518518
- name: failPoint
519519
object: testRunner
@@ -1711,7 +1711,7 @@ tests:
17111711
- commandFailedEvent:
17121712
commandName: dropIndexes
17131713

1714-
- description: 'collection.aggregate retries at most maxAttempts=5 times'
1714+
- description: 'collection.aggregate write retries at most maxAttempts=5 times'
17151715
operations:
17161716
- name: failPoint
17171717
object: testRunner

‎specifications/client-backpressure/tests/backpressure-retry-max-attempts.yml.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ initialData:
4141
- { _id: 2, x: 22 }
4242

4343
tests: {% for operation in operations %}
44-
- description: '{{operation.object}}.{{operation.operation_name}} retries at most maxAttempts=5 times'
44+
- description: '{{operation.object}}.{{operation.operation_name}}{{ " " + operation.operation_type + "" if operation.operation_name == "aggregate" else "" }} retries at most maxAttempts=5 times'
4545
{%- if ((operation.operation_name == 'clientBulkWrite')) %}
4646
runOnRequirements:
4747
- minServerVersion: '8.0' # client bulk write added to server in 8.0

0 commit comments

Comments
 (0)