SERVER-18566 findAndModify: re-check for primary before upsert

1 files changed, 14 insertions, 0 deletions

diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
index 5399595d76b..611faf6d5d7 100644
--- a/src/mongo/db/commands/find_and_modify.cpp
+++ b/src/mongo/db/commands/find_and_modify.cpp
@@ -430,6 +430,20 @@ namespace mongo {
                                                                                  &newDoc));
                         }
 
+                        // Return an error if the primary stepped down while our PlanExecutor was
+                        // yielding locks.  update() and deleteObjects() check this for us in the
+                        // update and delete cases, respectively, but we need to perform an explicit
+                        // check here for the upsert case.
+                        if (!repl::getGlobalReplicationCoordinator()
+                                ->canAcceptWritesForDatabase(dbname)) {
+                            return appendCommandStatus(result,
+                                                       Status(ErrorCodes::NotMaster,
+                                                              str::stream()
+                                                                  << "Stepped down from primary "
+                                                                  << "while running findAndModify "
+                                                                  << "in " << ns));
+                        }
+
                         const bool enforceQuota = true;
                         uassertStatusOK(collection->insertDocument(txn, newDoc, enforceQuota)
                                         .getStatus());