JAVA-535: Respecting read preference on DB for DB.getCollectionNames

Author: jyemin

src/main/com/mongodb/DB.java

@@ -295,8 +295,7 @@ public Set<String> getCollectionNames()
         if (namespaces == null)
             throw new RuntimeException("this is impossible");
 
-        // TODO - Is ReadPreference OK for collection Names?
-        Iterator<DBObject> i = namespaces.__find(new BasicDBObject(), null, 0, 0, 0, getOptions(), null, null);
+        Iterator<DBObject> i = namespaces.__find(new BasicDBObject(), null, 0, 0, 0, getOptions(), getReadPreference(), null);
         if (i == null)
             return new HashSet<String>();
 

src/test/com/mongodb/DBTests.java

@@ -123,15 +123,35 @@ public void testCommandToSecondary() throws MongoException, UnknownHostException
 
             DB db = mongo.getDB("secondaryTest");
             db.setReadPreference(ReadPreference.SECONDARY);
-//        CommandResult result = db.command("ping");
-//        assertNotEquals(primary, result.get("serverUsed"));
+            CommandResult result = db.command("ping");
+            assertNotEquals(primary, result.get("serverUsed"));
+        } finally {
+            mongo.close();
+        }
+    }
 
-            db.getCollection("secondaryTest").findOne();
+    @Test
+    public void testGetCollectionNamesToSecondary() throws MongoException, UnknownHostException {
+        Mongo mongo = new Mongo(Arrays.asList(new ServerAddress("127.0.0.1"), new ServerAddress("127.0.0.1", 27018)));
+
+        try {
+            if (isStandalone(mongo)) {
+                return;
+            }
+
+            String secondary = getASecondaryAsString(mongo);
+            mongo.close();
+            mongo = new Mongo(secondary);
+            DB db = mongo.getDB("secondaryTest");
+            db.setReadPreference(ReadPreference.SECONDARY);
+            db.getCollectionNames();
         } finally {
             mongo.close();
         }
     }
 
+
+
     @Test
     @SuppressWarnings("deprecation")
     public void testTurnOffSlaveOk() throws MongoException, UnknownHostException {

src/test/com/mongodb/util/TestCase.java

@@ -259,6 +259,16 @@ protected boolean isStandalone(Mongo mongo) {
 
     @SuppressWarnings({"unchecked"})
     protected String getPrimaryAsString(Mongo mongo) {
+        return getMemberNameByState(mongo, "primary");
+    }
+
+    @SuppressWarnings({"unchecked"})
+    protected String getASecondaryAsString(Mongo mongo) {
+        return getMemberNameByState(mongo, "secondary");
+    }
+
+    @SuppressWarnings({"unchecked"})
+    protected String getMemberNameByState(Mongo mongo, String stateStrToMatch) {
         CommandResult replicaSetStatus = runReplicaSetStatusCommand(mongo);
 
         for (final BasicDBObject member : (List<BasicDBObject>) replicaSetStatus.get("members")) {
@@ -268,11 +278,11 @@ protected String getPrimaryAsString(Mongo mongo) {
 
             final String stateStr = member.getString("stateStr");
 
-            if (stateStr.equals("PRIMARY"))
+            if (stateStr.equalsIgnoreCase(stateStrToMatch))
                 return hostnameAndPort;
         }
 
-        throw new IllegalStateException("No primary defined");
+        throw new IllegalStateException("No member found in state " + stateStrToMatch);
     }
 
     @SuppressWarnings("unchecked")