SERVER-5625 don't throw on problem setting shard version on initial connect

1 files changed, 10 insertions, 1 deletions

diff --git a/src/mongo/s/shardconnection.cpp b/src/mongo/s/shardconnection.cpp
index 6d21234071a..2ef03996367 100644
--- a/src/mongo/s/shardconnection.cpp
+++ b/src/mongo/s/shardconnection.cpp
@@ -33,6 +33,8 @@
 
 namespace mongo {
 
+    MONGO_EXPORT_SERVER_PARAMETER(ignoreInitialVersionFailure, bool, false);
+
     DBConnectionPool shardConnectionPool;
 
     class ClientConnections;
@@ -254,7 +256,14 @@ namespace mongo {
 
                     warning() << "problem while initially checking shard versions on"
                               << " " << shard.getName() << causedBy(e) << endl;
-                    throw;
+                    
+                    if ( !ignoreInitialVersionFailure ) {
+                        throw;
+                    }
+                    else {
+                        // We swallow the error here, checking shard version here is a heuristic to
+                        // prevent later stale config exceptions, not required for correctness.
+                    }
                 }
             }
         }