xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-76335 assertRetryableCommandWorked should check command results

Browse Source
This commit is contained in:
Allison Easton
2023-04-21 12:11:16 +00:00
committed by Evergreen Agent
parent 342b9c56d7
commit 80f7c41df0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jstests/libs/fail_point_util.js
View File

@@ -30,7 +30,7 @@ configureFailPoint = function(conn, failPointName, data = {}, failPointMode = "a
// number of times the fail point is entered between the time it returns
// and the next time it gets called.
sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
conn.adminCommand({
return conn.adminCommand({
waitForFailPoint: failPointName,
timesEntered: this.timesEntered + timesEntered,
maxTimeMS: maxTimeMS
@@ -54,7 +54,7 @@ configureFailPoint = function(conn, failPointName, data = {}, failPointMode = "a
},
off: function() {
sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
conn.adminCommand({configureFailPoint: failPointName, mode: "off"});
return conn.adminCommand({configureFailPoint: failPointName, mode: "off"});
}, "Timed out disabling fail point " + failPointName);
}
};
@@ -74,7 +74,7 @@ configureFailPointForRS = function(conns, failPointName, data = {}, failPointMod
off: function() {
conns.forEach((conn) => {
sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
conn.adminCommand({configureFailPoint: failPointName, mode: "off"});
return conn.adminCommand({configureFailPoint: failPointName, mode: "off"});
}, "Timed out disabling fail point " + failPointName);
});
}

10
src/mongo/shell/utils_sh.js
View File

@@ -69,7 +69,7 @@ sh.assertRetryableCommandWorkedOrFailedWithCodes = function(cmd, msg, expectedEr
var res = undefined;
assert.soon(function() {
try {
res = cmd();
res = assert.commandWorked(cmd());
return true;
} catch (err) {
if (err instanceof WriteError && ErrorCodes.isRetriableError(err.code)) {
@@ -271,7 +271,7 @@ sh.disableAutoMerge = function(coll) {
}
return sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
dbase.getSiblingDB("config").collections.update(
return dbase.getSiblingDB("config").collections.update(
{_id: coll + ""},
{$set: {"enableAutoMerge": false}},
{writeConcern: {w: 'majority', wtimeout: 60000}});
@@ -290,7 +290,7 @@ sh.enableAutoMerge = function(coll) {
}
return sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
dbase.getSiblingDB("config").collections.update(
return dbase.getSiblingDB("config").collections.update(
{_id: coll + ""},
{$unset: {"enableAutoMerge": 1}},
{writeConcern: {w: 'majority', wtimeout: 60000}});
@@ -369,7 +369,7 @@ sh.disableBalancing = function(coll) {
}
return sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
dbase.getSiblingDB("config").collections.update(
return dbase.getSiblingDB("config").collections.update(
{_id: coll + ""},
{$set: {"noBalance": true}},
{writeConcern: {w: 'majority', wtimeout: 60000}});
@@ -388,7 +388,7 @@ sh.enableBalancing = function(coll) {
}
return sh.assertRetryableCommandWorkedOrFailedWithCodes(() => {
dbase.getSiblingDB("config").collections.update(
return dbase.getSiblingDB("config").collections.update(
{_id: coll + ""},
{$set: {"noBalance": false}},
{writeConcern: {w: 'majority', wtimeout: 60000}});