Skip to content

GODRIVER-2002 Remove 'slaveok' from source code and most spec tests #713

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.

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 4 commits into from
Aug 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/change-streams/legacy/change-streams-errors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ tests:
mode: { times: 1 }
data:
failCommands: ["getMore"]
errorCode: 216 # An error code that's not on the old blacklist or whitelist
errorCode: 216 # An error code that's not on the old deny or allow lists
closeConnection: false
target: collection
topology:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@
}
},
{
"description": "change stream resumes after NotMaster",
"description": "change stream resumes after NotWritablePrimary",
"minServerVersion": "4.2",
"maxServerVersion": "4.2.99",
"failPoint": {
Expand Down Expand Up @@ -1069,7 +1069,7 @@
}
},
{
"description": "change stream resumes after NotMasterNoSlaveOk",
"description": "change stream resumes after NotPrimaryNoSecondaryOk",
"minServerVersion": "4.2",
"maxServerVersion": "4.2.99",
"failPoint": {
Expand Down Expand Up @@ -1166,7 +1166,7 @@
}
},
{
"description": "change stream resumes after NotMasterOrSecondary",
"description": "change stream resumes after NotPrimaryOrSecondary",
"minServerVersion": "4.2",
"maxServerVersion": "4.2.99",
"failPoint": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ tests:
x:
$numberInt: "1"
-
description: "change stream resumes after NotMaster"
description: "change stream resumes after NotWritablePrimary"
minServerVersion: "4.2"
maxServerVersion: "4.2.99"
failPoint:
Expand Down Expand Up @@ -717,7 +717,7 @@ tests:
x:
$numberInt: "1"
-
description: "change stream resumes after NotMasterNoSlaveOk"
description: "change stream resumes after NotPrimaryNoSecondaryOk"
minServerVersion: "4.2"
maxServerVersion: "4.2.99"
failPoint:
Expand Down Expand Up @@ -782,7 +782,7 @@ tests:
x:
$numberInt: "1"
-
description: "change stream resumes after NotMasterOrSecondary"
description: "change stream resumes after NotPrimaryOrSecondary"
minServerVersion: "4.2"
maxServerVersion: "4.2.99"
failPoint:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@
}
},
{
"description": "change stream resumes after NotMaster",
"description": "change stream resumes after NotWritablePrimary",
"minServerVersion": "4.3.1",
"failPoint": {
"configureFailPoint": "failGetMoreAfterCursorCheckout",
Expand Down Expand Up @@ -943,7 +943,7 @@
}
},
{
"description": "change stream resumes after NotMasterNoSlaveOk",
"description": "change stream resumes after NotPrimaryNoSecondaryOk",
"minServerVersion": "4.3.1",
"failPoint": {
"configureFailPoint": "failGetMoreAfterCursorCheckout",
Expand Down Expand Up @@ -1037,7 +1037,7 @@
}
},
{
"description": "change stream resumes after NotMasterOrSecondary",
"description": "change stream resumes after NotPrimaryOrSecondary",
"minServerVersion": "4.3.1",
"failPoint": {
"configureFailPoint": "failGetMoreAfterCursorCheckout",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ tests:
x:
$numberInt: "1"
-
description: "change stream resumes after NotMaster"
description: "change stream resumes after NotWritablePrimary"
minServerVersion: "4.3.1"
failPoint:
configureFailPoint: failGetMoreAfterCursorCheckout
Expand Down Expand Up @@ -643,7 +643,7 @@ tests:
x:
$numberInt: "1"
-
description: "change stream resumes after NotMasterNoSlaveOk"
description: "change stream resumes after NotPrimaryNoSecondaryOk"
minServerVersion: "4.3.1"
failPoint:
configureFailPoint: failGetMoreAfterCursorCheckout
Expand Down Expand Up @@ -707,7 +707,7 @@ tests:
x:
$numberInt: "1"
-
description: "change stream resumes after NotMasterOrSecondary"
description: "change stream resumes after NotPrimaryOrSecondary"
minServerVersion: "4.3.1"
failPoint:
configureFailPoint: failGetMoreAfterCursorCheckout
Expand Down Expand Up @@ -1026,7 +1026,7 @@ tests:
fullDocument:
x:
$numberInt: "1"
# The next two tests ensure that the driver only uses the error label, not the whitelist.
# The next two tests ensure that the driver only uses the error label, not the allow list.
-
description: "change stream resumes if error contains ResumableChangeStreamError"
minServerVersion: "4.3.1"
Expand All @@ -1035,7 +1035,7 @@ tests:
mode: { times: 1 }
data:
failCommands: ["getMore"]
errorCode: 50 # Use an error code that does not have the whitelist label by default
errorCode: 50 # Use an error code that does not have the allow list label by default
closeConnection: false
errorLabels: ["ResumableChangeStreamError"]
target: collection
Expand Down Expand Up @@ -1097,11 +1097,11 @@ tests:
description: "change stream does not resume if error does not contain ResumableChangeStreamError"
minServerVersion: "4.3.1"
failPoint:
configureFailPoint: failCommand # failCommand will not add the whitelist error label
configureFailPoint: failCommand # failCommand will not add the allow list error label
mode: { times: 1 }
data:
failCommands: ["getMore"]
errorCode: 6 # Use an error code that is on the whitelist
errorCode: 6 # Use an error code that is on the allow list
closeConnection: false
target: collection
topology:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
}
},
{
"description": "InsertOne succeeds after NotMaster",
"description": "InsertOne succeeds after NotWritablePrimary",
"failPoint": {
"configureFailPoint": "failCommand",
"mode": {
Expand Down Expand Up @@ -167,7 +167,7 @@
}
},
{
"description": "InsertOne succeeds after NotMasterOrSecondary",
"description": "InsertOne succeeds after NotPrimaryOrSecondary",
"failPoint": {
"configureFailPoint": "failCommand",
"mode": {
Expand Down Expand Up @@ -216,7 +216,7 @@
}
},
{
"description": "InsertOne succeeds after NotMasterNoSlaveOk",
"description": "InsertOne succeeds after NotPrimaryNoSecondaryOk",
"failPoint": {
"configureFailPoint": "failCommand",
"mode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ tests:
- { _id: 1, x: 11 }
- { _id: 2, x: 22 }
-
description: "InsertOne succeeds after NotMaster"
description: "InsertOne succeeds after NotWritablePrimary"
failPoint:
configureFailPoint: failCommand
mode: { times: 1 }
Expand All @@ -78,7 +78,7 @@ tests:
- { _id: 2, x: 22 }
- { _id: 3, x: 33 }
-
description: "InsertOne succeeds after NotMasterOrSecondary"
description: "InsertOne succeeds after NotPrimaryOrSecondary"
failPoint:
configureFailPoint: failCommand
mode: { times: 1 }
Expand All @@ -100,7 +100,7 @@ tests:
- { _id: 2, x: 22 }
- { _id: 3, x: 33 }
-
description: "InsertOne succeeds after NotMasterNoSlaveOk"
description: "InsertOne succeeds after NotPrimaryNoSecondaryOk"
failPoint:
configureFailPoint: failCommand
mode: { times: 1 }
Expand Down
Loading