JAVA-2083: Ignore failed ismaster response in server monitor

mongodb · Jan 13, 2016 · 0a3e00d · 0a3e00d
1 parent 62b0a8b
commit 0a3e00d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 16 deletions.
diff --git a/src/main/com/mongodb/ServerMonitor.java b/src/main/com/mongodb/ServerMonitor.java
@@ -272,7 +272,11 @@ private Set<String> listToSet(final List<String> list) {
         }
     }
 
-    private static ServerType getServerType(final BasicDBObject isMasterResult) {
+    static ServerType getServerType(final CommandResult isMasterResult) {
+        if (!isMasterResult.ok()) {
+            return ServerType.Unknown;
+        }
+
         if (isReplicaSetMember(isMasterResult)) {
 
             if (isMasterResult.getBoolean("hidden", false)) {

diff --git a/src/test/com/mongodb/ServerMonitorSpecification.groovy b/src/test/com/mongodb/ServerMonitorSpecification.groovy
@@ -160,22 +160,52 @@ class ServerMonitorSpecification extends FunctionalSpecification {
     }
 
     def 'should report correct server type'() {
+        given:
+        CommandResult isMasterCommandResult = new CommandResult(new ServerAddress())
+        isMasterCommandResult.putAll(response)
+
         expect:
-        ServerMonitor.getServerType(new BasicDBObject('setName', 'test')
-                                            .append('hidden', true)
-                                            .append('secondary', true)) == ServerType.ReplicaSetOther
-        ServerMonitor.getServerType(new BasicDBObject('setName', 'test')
-                                            .append('ismaster', true)) == ServerType.ReplicaSetPrimary
-        ServerMonitor.getServerType(new BasicDBObject('setName', 'test')
-                                            .append('secondary', true)) == ServerType.ReplicaSetSecondary
-        ServerMonitor.getServerType(new BasicDBObject('setName', 'test')
-                                            .append('arbiterOnly', true)) == ServerType.ReplicaSetArbiter
-        ServerMonitor.getServerType(new BasicDBObject('setName', 'test')
-                                            .append('hosts', ['server1:27017'])) == ServerType.ReplicaSetOther
-        ServerMonitor.getServerType(new BasicDBObject('isreplicaset', true)) == ServerType.ReplicaSetGhost
-        ServerMonitor.getServerType(new BasicDBObject()) == ServerType.StandAlone
-        ServerMonitor.getServerType(new BasicDBObject('msg', 'isdbgrid')) == ServerType.ShardRouter
-        ServerMonitor.getServerType(new BasicDBObject('msg', 'whatever')) == ServerType.StandAlone
+        ServerMonitor.getServerType(isMasterCommandResult) == serverType
+
+        where:
+        response << [
+                new BasicDBObject('ok', 0),
+                new BasicDBObject('ok', 1)
+                        .append('setName', 'test')
+                        .append('hidden', true)
+                        .append('secondary', true),
+                new BasicDBObject('ok', 1)
+                        .append('setName', 'test')
+                        .append('ismaster', true),
+                new BasicDBObject('ok', 1)
+                        .append('setName', 'test')
+                        .append('secondary', true),
+                new BasicDBObject('ok', 1)
+                        .append('setName', 'test')
+                        .append('arbiterOnly', true),
+                new BasicDBObject('ok', 1)
+                        .append('setName', 'test')
+                        .append('hosts', ['server1:27017']),
+                new BasicDBObject('ok', 1)
+                        .append('isreplicaset', true),
+                new BasicDBObject('ok', 1),
+                new BasicDBObject('ok', 1)
+                        .append('msg', 'isdbgrid'),
+                new BasicDBObject('ok', 1)
+                        .append('msg', 'whatever')
+        ]
+        serverType << [
+                ServerType.Unknown,
+                ServerType.ReplicaSetOther,
+                ServerType.ReplicaSetPrimary,
+                ServerType.ReplicaSetSecondary,
+                ServerType.ReplicaSetArbiter,
+                ServerType.ReplicaSetOther,
+                ServerType.ReplicaSetGhost,
+                ServerType.StandAlone,
+                ServerType.ShardRouter,
+                ServerType.StandAlone
+        ]
     }
 
     def initializeServerMonitor(ServerAddress address) {