SERVER-60946 Retry NotWritablePrimary error when initiating replset to handle concurrent priority takeover.

(cherry picked from commit d2d7164bb02fff924ac787f6d422dffb22ef0b94)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 905346b8ff3..a5f23ff892c 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -1521,6 +1521,7 @@ var ReplSetTest = function(opts) {
             for (let i = 2; i <= originalMembers.length; i++) {
                 print("ReplSetTest adding in node " + i);
                 assert.soon(function() {
+                    primary = self.getPrimary().getDB("admin");
                     const statusRes =
                         assert.commandWorked(primary.adminCommand({replSetGetStatus: 1}));
                     const primaryMember = statusRes.members.find((m) => m.self);
@@ -1535,7 +1536,8 @@ var ReplSetTest = function(opts) {
                         ErrorCodes.NewReplicaSetConfigurationIncompatible,
                         ErrorCodes.InterruptedDueToReplStateChange,
                         ErrorCodes.ConfigurationInProgress,
-                        ErrorCodes.CurrentConfigNotCommittedYet
+                        ErrorCodes.CurrentConfigNotCommittedYet,
+                        ErrorCodes.NotWritablePrimary
                     ];
                     if (retryableReconfigCodes.includes(reconfigRes.code)) {
                         print("Retrying reconfig due to " + tojsononeline(reconfigRes));