SERVER-20407 Sharded findAndModify should retry on shard version mismatch

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mongo/s/s_only.cpp b/src/mongo/s/s_only.cpp
index 275ca7ae3d2..d62107a76d5 100644
--- a/src/mongo/s/s_only.cpp
+++ b/src/mongo/s/s_only.cpp
@@ -123,13 +123,14 @@ void Command::execCommandClientBasic(OperationContext* txn,
     }
 
     std::string errmsg;
-    bool ok;
+    bool ok = false;
     try {
         ok = c->run(txn, dbname, cmdObj, queryOptions, errmsg, result);
     } catch (const DBException& e) {
-        ok = false;
-        int code = e.getCode();
-        if (code == RecvStaleConfigCode) {  // code for StaleConfigException
+        const int code = e.getCode();
+
+        // Codes for StaleConfigException
+        if (code == RecvStaleConfigCode || code == SendStaleConfigCode) {
             throw;
         }