CSHARP-1434: Fix issue with recognizing hidden members as secondaries temporarily.

Author: craiggwilson

src/MongoDB.Driver.Core.Tests/Core/Clusters/MultiServerClusterTests.cs

@@ -276,7 +276,6 @@ public void Should_not_add_a_new_server_from_a_secondary_when_a_primary_exists()
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetArbiter)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetGhost)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetOther)]
-        [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetPassive)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetPrimary)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetSecondary)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.Standalone)]

src/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs

@@ -85,14 +85,12 @@ public void Initialize_should_create_and_initialize_the_server()
         [TestCase(ClusterConnectionMode.Standalone, ServerType.ReplicaSetArbiter)]
         [TestCase(ClusterConnectionMode.Standalone, ServerType.ReplicaSetGhost)]
         [TestCase(ClusterConnectionMode.Standalone, ServerType.ReplicaSetOther)]
-        [TestCase(ClusterConnectionMode.Standalone, ServerType.ReplicaSetPassive)]
         [TestCase(ClusterConnectionMode.Standalone, ServerType.ReplicaSetPrimary)]
         [TestCase(ClusterConnectionMode.Standalone, ServerType.ReplicaSetSecondary)]
         [TestCase(ClusterConnectionMode.Standalone, ServerType.ShardRouter)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetArbiter)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetGhost)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetOther)]
-        [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetPassive)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetPrimary)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.ReplicaSetSecondary)]
         [TestCase(ClusterConnectionMode.Sharded, ServerType.Standalone)]

src/MongoDB.Driver.Core.Tests/Core/Connections/IsMasterResultTests.cs

@@ -147,26 +147,25 @@ public void Me_should_parse_document_correctly(string json, string expectedEndPo
         [TestCase("{ ok: 1, isreplicaset: true, setName: \"awesome\", ismaster: true }", ServerType.ReplicaSetGhost)]
         [TestCase("{ ok: 1, setName: \"awesome\", ismaster: true }", ServerType.ReplicaSetPrimary)]
         [TestCase("{ ok: 1, setName: \"awesome\", ismaster: true, secondary: true }", ServerType.ReplicaSetPrimary)]
-        [TestCase("{ ok: 1, setName: \"awesome\", secondary: true, arbiterOnly: true }", ServerType.ReplicaSetSecondary)]
         [TestCase("{ ok: 1, setName: \"awesome\", secondary: true }", ServerType.ReplicaSetSecondary)]
-        [TestCase("{ ok: 1, setName: \"awesome\", passive: true }", ServerType.ReplicaSetPassive)]
-        [TestCase("{ ok: 1, setName: \"awesome\", passive: true }", ServerType.ReplicaSetPassive)]
+        [TestCase("{ ok: 1, setName: \"awesome\", secondary: true, passive: true }", ServerType.ReplicaSetSecondary)]
         [TestCase("{ ok: 1, setName: \"awesome\", arbiterOnly: true }", ServerType.ReplicaSetArbiter)]
         [TestCase("{ ok: 1, setName: \"awesome\", ismaster: false, secondary: false, arbiterOnly: false }", ServerType.ReplicaSetOther)]
         [TestCase("{ ok: 1, setName: \"awesome\", ismaster: false, secondary: false }", ServerType.ReplicaSetOther)]
         [TestCase("{ ok: 1, setName: \"awesome\", ismaster: false }", ServerType.ReplicaSetOther)]
         [TestCase("{ ok: 1, setName: \"awesome\", secondary: false }", ServerType.ReplicaSetOther)]
         [TestCase("{ ok: 1, setName: \"awesome\", arbiterOnly: false }", ServerType.ReplicaSetOther)]
-        [TestCase("{ ok: 1, setName: \"awesome\", hidden: true }", ServerType.ReplicaSetPassive)]
+        [TestCase("{ ok: 1, setName: \"awesome\", secondary: true, hidden: true }", ServerType.ReplicaSetOther)]
+        [TestCase("{ ok: 1, setName: \"awesome\", secondary: true, hidden: false }", ServerType.ReplicaSetSecondary)]
         [TestCase("{ ok: 1, setName: \"awesome\" }", ServerType.ReplicaSetOther)]
         [TestCase("{ ok: 1, isreplicaset: true }", ServerType.ReplicaSetGhost)]
         [TestCase("{ ok: 1, isreplicaset: 1 }", ServerType.ReplicaSetGhost)]
         [TestCase("{ ok: 1, isreplicaset: false }", ServerType.Standalone)]
         [TestCase("{ ok: 1, isreplicaset: 0 }", ServerType.Standalone)]
         [TestCase("{ ok: 1, msg: \"isdbgrid\" }", ServerType.ShardRouter)]
         [TestCase("{ ok: 1, msg: \"isdbgrid\" }", ServerType.ShardRouter)]
-        [TestCase("{ ok: 1, }", ServerType.Standalone)]
-        [TestCase("{ ok: 0, }", ServerType.Unknown)]
+        [TestCase("{ ok: 1 }", ServerType.Standalone)]
+        [TestCase("{ ok: 0 }", ServerType.Unknown)]
         public void ServerType_should_parse_document_correctly(string json, ServerType expected)
         {
             var subject = new IsMasterResult(BsonDocument.Parse(json));

src/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/rs/rsother_discovered.json

@@ -5,24 +5,46 @@
             "outcome": {
                 "servers": {
                     "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
+                        "setName": "rs", 
+                        "type": "RSOther"
                     }, 
                     "b:27017": {
                         "setName": "rs", 
                         "type": "RSOther"
+                    }, 
+                    "c:27017": {
+                        "setName": null, 
+                        "type": "Unknown"
+                    }, 
+                    "d:27017": {
+                        "setName": null, 
+                        "type": "Unknown"
                     }
                 }, 
                 "setName": "rs", 
                 "topologyType": "ReplicaSetNoPrimary"
             }, 
             "responses": [
+                [
+                    "a:27017", 
+                    {
+                        "hidden": true, 
+                        "hosts": [
+                            "c:27017", 
+                            "d:27017"
+                        ], 
+                        "ismaster": false, 
+                        "ok": 1, 
+                        "secondary": true, 
+                        "setName": "rs"
+                    }
+                ], 
                 [
                     "b:27017", 
                     {
                         "hosts": [
-                            "a:27017", 
-                            "b:27017"
+                            "c:27017", 
+                            "d:27017"
                         ], 
                         "ismaster": false, 
                         "ok": 1, 

src/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/rs/rsother_discovered.yml

@@ -7,12 +7,21 @@ phases: [
     {
         responses: [
 
+                ["a:27017", {
+
+                    ok: 1,
+                    ismaster: false,
+                    secondary: true,
+                    hidden: true,
+                    hosts: ["c:27017", "d:27017"],
+                    setName: "rs"
+                }],
                 ["b:27017", {
 
                     ok: 1,
                     ismaster: false,
                     secondary: false,
-                    hosts: ["a:27017", "b:27017"],
+                    hosts: ["c:27017", "d:27017"],
                     setName: "rs"
                 }]
         ],
@@ -23,14 +32,26 @@ phases: [
 
                 "a:27017": {
 
-                    type: "Unknown",
-                    setName:
+                    type: "RSOther",
+                    setName: "rs"
                 },
 
                 "b:27017": {
 
                     type: "RSOther",
                     setName: "rs"
+                },
+
+                "c:27017": {
+
+                    type: "Unknown",
+                    setName: 
+                },
+
+                "d:27017": {
+
+                    type: "Unknown",
+                    setName: 
                 }
             },
 

src/MongoDB.Driver.Core/Core/Connections/IsMasterResult.cs

@@ -188,13 +188,13 @@ public ServerType ServerType
                     {
                         return ServerType.ReplicaSetPrimary;
                     }
-                    if (_wrapped.GetValue("secondary", false).ToBoolean())
+                    if (_wrapped.GetValue("hidden", false).ToBoolean())
                     {
-                        return ServerType.ReplicaSetSecondary;
+                        return ServerType.ReplicaSetOther;
                     }
-                    if (_wrapped.GetValue("passive", false).ToBoolean() || _wrapped.GetValue("hidden", false).ToBoolean())
+                    if (_wrapped.GetValue("secondary", false).ToBoolean())
                     {
-                        return ServerType.ReplicaSetPassive;
+                        return ServerType.ReplicaSetSecondary;
                     }
                     if (_wrapped.GetValue("arbiterOnly", false).ToBoolean())
                     {

src/MongoDB.Driver.Core/Core/Servers/ServerType.cs

@@ -53,8 +53,9 @@ public enum ServerType
         ReplicaSetSecondary,
 
         /// <summary>
-        /// The server is a replica set passive member.
+        /// Use ReplicaSetSecondary instead.
         /// </summary>
+        [Obsolete("Passives are treated the same as secondaries.")]
         ReplicaSetPassive,
 
         /// <summary>
@@ -114,14 +115,13 @@ public static bool IsWritable(this ServerType serverType)
         /// <returns>The cluster type.</returns>
         public static ClusterType ToClusterType(this ServerType serverType)
         {
-            switch(serverType)
+            switch (serverType)
             {
                 case ServerType.ReplicaSetPrimary:
                 case ServerType.ReplicaSetSecondary:
                 case ServerType.ReplicaSetArbiter:
                 case ServerType.ReplicaSetOther:
                 case ServerType.ReplicaSetGhost:
-                case ServerType.ReplicaSetPassive:
                     return ClusterType.ReplicaSet;
                 case ServerType.ShardRouter:
                     return ClusterType.Sharded;

src/MongoDB.Driver.Legacy/Communication/MongoServerInstance.cs

@@ -80,7 +80,6 @@ public MongoServerInstanceType InstanceType
                 switch (serverDescription.Type)
                 {
                     case ServerType.ReplicaSetArbiter:
-                    case ServerType.ReplicaSetPassive:
                     case ServerType.ReplicaSetPrimary:
                     case ServerType.ReplicaSetSecondary:
                     case ServerType.ReplicaSetOther:
@@ -133,12 +132,12 @@ public bool IsArbiter
         /// <summary>
         /// Gets a value indicating whether this server instance is a passive instance.
         /// </summary>
+        [Obsolete("Passives are treated the same as secondaries.")]
         public bool IsPassive
         {
             get
             {
-                var serverDescription = GetServerDescription();
-                return serverDescription.Type == ServerType.ReplicaSetPassive;
+                return false;
             }
         }
 

src/MongoDB.Driver.Legacy/MongoServer.cs

@@ -238,14 +238,12 @@ public virtual MongoServerInstance[] Instances
         /// <summary>
         /// Gets the passive instances.
         /// </summary>
+        [Obsolete("Passives are treated the same as secondaries.")]
         public virtual MongoServerInstance[] Passives
         {
             get
             {
-                lock (_serverLock)
-                {
-                    return _serverInstances.Where(i => i.IsPassive).ToArray();
-                }
+                return new MongoServerInstance[0];
             }
         }