backport of 8e42151eccd3766bd0ad0320340d930ad0cc54ed for SERVER-6463

1 files changed, 8 insertions, 1 deletions

diff --git a/client/dbclient_rs.cpp b/client/dbclient_rs.cpp
index be66bb451c4..b1f80670e78 100644
--- a/client/dbclient_rs.cpp
+++ b/client/dbclient_rs.cpp
@@ -405,7 +405,7 @@ namespace mongo {
             break;
         }
 
-        return changed || origHosts != numHosts;
+        return (changed || origHosts != numHosts) && numHosts > 0;
 
     }
 
@@ -530,6 +530,13 @@ namespace mongo {
             log( ! verbose ) << "ReplicaSetMonitor::_checkConnection: " << conn->toString()
                              << ' ' << o << endl;
             
+            if (!o["secondary"].trueValue() && !o["ismaster"].trueValue()) {
+                /* This node is not in steady state so don't trust the host list.
+                 * In the worst case, this node can even be a non member of the set.
+                 */
+                return false;
+            }
+
             // add other nodes
             BSONArrayBuilder b;
             if ( o["hosts"].type() == Array ) {