diff options
-rw-r--r-- | jstests/multiVersion/libs/multi_rs.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/jstests/multiVersion/libs/multi_rs.js b/jstests/multiVersion/libs/multi_rs.js index 4fbb3ec82c3..ecdfb4e4687 100644 --- a/jstests/multiVersion/libs/multi_rs.js +++ b/jstests/multiVersion/libs/multi_rs.js @@ -31,9 +31,12 @@ ReplSetTest.prototype.upgradeSet = function(options, user, pwd) { } } - assert.eq( - this.getPrimary(), primary, "Primary changed unexpectedly after upgrading secondaries"); - this.upgradePrimary(primary, Object.assign({}, options), user, pwd); + if (this.getPrimary() == primary) { + this.upgradePrimary(primary, Object.assign({}, options), user, pwd); + } else { + // An election occured during upgrade, old primary is now a secondary. + this.upgradeMembers([primary], Object.assign({}, options), user, pwd); + } }; function mergeNodeOptions(nodeOptions, options) { |