Skip to content

Commit 38e65fc

Browse files
jmikolajmikola
authored
DRIVERS-2713: Run legacy transaction tests on LB topologies (#1459)
d2de776 previously added "load-balanced" to other legacy test formats but omitted the transactions spec. This change ensures legacy transaction tests can be run on LB topologies, including Atlas Serverless (where "serverless: forbid" is not specified). Some tests in retryable-commit.yml are incompatible with serverless and have been split off into a separate file with "serverless: forbid".
1 parent fcc5fd3 commit 38e65fc

Some content is hidden

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

68 files changed

+1198
-1121
lines changed

‎source/transactions/tests/README.rst

Lines changed: 3 additions & 2 deletions

‎source/transactions/tests/legacy/abort.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/abort.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/bulk.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/bulk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/causal-consistency.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/causal-consistency.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/commit.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/count.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/count.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runOn:
55
topology: ["replicaset"]
66
-
77
minServerVersion: "4.1.8"
8-
topology: ["sharded"]
8+
topology: ["sharded", "load-balanced"]
99

1010
database_name: &database_name "transaction-tests"
1111
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/create-collection.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "4.3.4",
55
"topology": [
66
"replicaset",
7-
"sharded"
7+
"sharded",
8+
"load-balanced"
89
]
910
}
1011
],

‎source/transactions/tests/legacy/create-collection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
runOn:
22
-
33
minServerVersion: "4.3.4"
4-
topology: ["replicaset", "sharded"]
4+
topology: ["replicaset", "sharded", "load-balanced"]
55

66
database_name: &database_name "transaction-tests"
77
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/create-index.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "4.3.4",
55
"topology": [
66
"replicaset",
7-
"sharded"
7+
"sharded",
8+
"load-balanced"
89
]
910
}
1011
],

‎source/transactions/tests/legacy/create-index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
runOn:
22
-
33
minServerVersion: "4.3.4"
4-
topology: ["replicaset", "sharded"]
4+
topology: ["replicaset", "sharded", "load-balanced"]
55

66
database_name: &database_name "transaction-tests"
77
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/delete.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/delete.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/error-labels-blockConnection.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "4.2",
55
"topology": [
66
"replicaset",
7-
"sharded"
7+
"sharded",
8+
"load-balanced"
89
]
910
}
1011
],

‎source/transactions/tests/legacy/error-labels-blockConnection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
runOn:
99
-
1010
minServerVersion: "4.2"
11-
topology: ["replicaset", "sharded"]
11+
topology: ["replicaset", "sharded", "load-balanced"]
1212

1313
database_name: &database_name "transaction-tests"
1414
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/error-labels.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
],
1415
"serverless": "forbid"
1516
}

‎source/transactions/tests/legacy/error-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88
# serverless proxy doesn't append error labels to errors in transactions
99
# caused by failpoints (CLOUDP-88216)
1010
serverless: "forbid"

‎source/transactions/tests/legacy/errors-client.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/errors-client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/errors.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/errors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/findOneAndDelete.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/findOneAndDelete.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/findOneAndReplace.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/findOneAndReplace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/findOneAndUpdate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/findOneAndUpdate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/insert.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/insert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runOn:
44
topology: ["replicaset"]
55
-
66
minServerVersion: "4.1.8"
7-
topology: ["sharded"]
7+
topology: ["sharded", "load-balanced"]
88

99
database_name: &database_name "transaction-tests"
1010
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/isolation.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"minServerVersion": "4.1.8",
1111
"topology": [
12-
"sharded"
12+
"sharded",
13+
"load-balanced"
1314
]
1415
}
1516
],

‎source/transactions/tests/legacy/isolation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runOn:
66
topology: ["replicaset"]
77
-
88
minServerVersion: "4.1.8"
9-
topology: ["sharded"]
9+
topology: ["sharded", "load-balanced"]
1010

1111
database_name: &database_name "transaction-tests"
1212
collection_name: &collection_name "test"

‎source/transactions/tests/legacy/mongos-pin-auto-tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
runOn:
1717
-
1818
minServerVersion: "4.1.8"
19-
topology: ["sharded"]
19+
topology: ["sharded", "load-balanced"]
2020
# serverless proxy doesn't append error labels to errors in transactions
2121
# caused by failpoints (CLOUDP-88216)
2222
serverless: "forbid"

‎source/transactions/tests/legacy/mongos-pin-auto.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{
44
"minServerVersion": "4.1.8",
55
"topology": [
6-
"sharded"
6+
"sharded",
7+
"load-balanced"
78
],
89
"serverless": "forbid"
910
}

‎source/transactions/tests/legacy/mongos-pin-auto.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
runOn:
44
-
55
minServerVersion: "4.1.8"
6-
topology: ["sharded"]
6+
topology: ["sharded", "load-balanced"]
77
# serverless proxy doesn't append error labels to errors in transactions
88
# caused by failpoints (CLOUDP-88216)
99
serverless: "forbid"

‎source/transactions/tests/legacy/mongos-recovery-token.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{
44
"minServerVersion": "4.1.8",
55
"topology": [
6-
"sharded"
6+
"sharded",
7+
"load-balanced"
78
],
89
"serverless": "forbid"
910
}

‎source/transactions/tests/legacy/mongos-recovery-token.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
runOn:
22
-
33
minServerVersion: "4.1.8"
4-
topology: ["sharded"]
4+
topology: ["sharded", "load-balanced"]
55
# serverless proxy doesn't use recovery tokens
66
serverless: "forbid"
77

‎source/transactions/tests/legacy/pin-mongos.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{
44
"minServerVersion": "4.1.8",
55
"topology": [
6-
"sharded"
6+
"sharded",
7+
"load-balanced"
78
],
89
"serverless": "forbid"
910
}

0 commit comments

Comments
 (0)