JAVA-1160: ClusterDescription.getAny now returns any ok server, not just primaries and secondaries. A new method, getAnyPrimaryOrSecondary, has been added for server selectors that will only talk to primaries or secondaries.

Author: jyemin

src/main/com/mongodb/ClusterDescription.java

@@ -139,14 +139,22 @@ public boolean apply(final ServerDescription serverDescription) {
     }
 
     public List<ServerDescription> getAny() {
+        return getServersByPredicate(new Predicate() {
+            public boolean apply(final ServerDescription serverDescription) {
+                return serverDescription.isOk();
+            }
+        });
+    }
+
+    public List<ServerDescription> getAnyPrimaryOrSecondary() {
         return getServersByPredicate(new Predicate() {
             public boolean apply(final ServerDescription serverDescription) {
                 return serverDescription.isPrimary() || serverDescription.isSecondary();
             }
         });
     }
 
-    public List<ServerDescription> getAny(final Tags tags) {
+    public List<ServerDescription> getAnyPrimaryOrSecondary(final Tags tags) {
         return getServersByPredicate(new Predicate() {
             public boolean apply(final ServerDescription serverDescription) {
                 return (serverDescription.isPrimary() || serverDescription.isSecondary()) && serverDescription.hasTags(tags);

src/main/com/mongodb/ReplicaSetStatus.java

@@ -32,7 +32,7 @@ public class ReplicaSetStatus {
     }
 
     public String getName() {
-        final List<ServerDescription> any = clusterDescription.getAny();
+        final List<ServerDescription> any = clusterDescription.getAnyPrimaryOrSecondary();
         return any.isEmpty() ? null : any.get(0).getSetName();
     }
 

src/main/com/mongodb/TaggableReadPreference.java

@@ -198,12 +198,12 @@ public String getName() {
 
         @Override
         List<ServerDescription> getServers(final ClusterDescription clusterDescription) {
-            return clusterDescription.getAny();
+            return clusterDescription.getAnyPrimaryOrSecondary();
         }
 
         @Override
         List<ServerDescription> getServersForTags(final ClusterDescription clusterDescription, final Tags tags) {
-            return clusterDescription.getAny(tags);
+            return clusterDescription.getAnyPrimaryOrSecondary(tags);
         }
     }