SERVER-48383 Wait for removed node to finish state transition in force_reconfig_skips_oplog_commitment.js

(cherry picked from commit 9c1c964657fc021f94e3d0e6fb806f6848547045)

1 files changed, 8 insertions, 2 deletions

diff --git a/jstests/replsets/force_reconfig_skips_oplog_commitment.js b/jstests/replsets/force_reconfig_skips_oplog_commitment.js
index bb98a7fee76..71d168ab43e 100644
--- a/jstests/replsets/force_reconfig_skips_oplog_commitment.js
+++ b/jstests/replsets/force_reconfig_skips_oplog_commitment.js
@@ -40,6 +40,14 @@ C1.members = C1.members.slice(0, 1);  // Remove the second node.
 C1.version++;
 assert.commandWorked(primary.adminCommand({replSetReconfig: C1}));
 
+// Make sure we can connect to the secondary after it was REMOVED.
+assert.soonNoExcept(function() {
+    let res = secondary.adminCommand({replSetGetStatus: 1});
+    assert.commandFailedWithCode(res, ErrorCodes.InvalidReplicaSetConfig);
+    return true;
+}, () => tojson(secondary.adminCommand({replSetGetStatus: 1})));
+reconnect(secondary);
+
 jsTestLog("Test that force reconfig skips oplog commitment.");
 let C2 = Object.assign({}, origConfig);
 
@@ -55,8 +63,6 @@ const C3 = primary.getDB("local").system.replset.findOne();
 // Run another force reconfig to verify the pre-condition check is also skipped
 assert.commandWorked(primary.adminCommand({replSetReconfig: C3, force: true}));
 
-// Make sure we can connect to the secondary after it was REMOVED.
-reconnect(secondary);
 restartServerReplication(secondary);
 rst.awaitNodesAgreeOnConfigVersion();