SERVER-15995: just loop if removed, don't log

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/repl/rs_sync.cpp b/src/mongo/db/repl/rs_sync.cpp
index 1f4de265a9d..401cea472bb 100644
--- a/src/mongo/db/repl/rs_sync.cpp
+++ b/src/mongo/db/repl/rs_sync.cpp
@@ -99,10 +99,18 @@ namespace repl {
             }
 
             const MemberState memberState = replCoord->getCurrentMemberState();
-            if (replCoord->getCurrentMemberState().arbiter()) {
+
+            // An arbiter can never transition to any other state, and doesn't replicate, ever
+            if (memberState.arbiter()) {
                 break;
             }
 
+            // If we are removed then we don't belong to the set anymore
+            if (memberState.removed()) {
+                sleepsecs(5);
+                continue;
+            }
+
             try {
 
                 if (memberState.primary() && !replCoord->isWaitingForApplierToDrain()) {