Merge pull request mongodb#28 from ajdavis/remove-max-electionid

remove-max-electionid
DmitryLukyanov · May 8, 2015 · 1c55400 · 1c55400
2 parents 77f5d5b + b8b85b6
commit 1c55400
Show file tree

Hide file tree

Showing 87 changed files with 4 additions and 152 deletions.
diff --git a/source/server-discovery-and-monitoring/tests/README.rst b/source/server-discovery-and-monitoring/tests/README.rst
@@ -59,7 +59,9 @@ A response is a pair of values:
 - The source, for example "a:27017".
   This is the address the client sent the "ismaster" command to.
 - An ismaster response, for example `{ok: 1, ismaster: true}`.
-  An empty response like `{}` indicates a network error
+  If the response includes an electionId it is shown in extended JSON like
+  `{"$oid": "000000000000000000000002"}`.
+  The empty response `{}` indicates a network error
   when attempting to call "ismaster".
 
 An "outcome" represents the correct TopologyDescription that results from
@@ -75,6 +77,7 @@ current TopologyDescription. It has the following keys:
 
 - type: A ServerType name, like "RSSecondary".
 - setName: A string with the expected replica set name, or null.
+- electionId: null, or an ObjectId.
 
 Use as unittests
 ----------------

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_arbiters.json b/source/server-discovery-and-monitoring/tests/rs/discover_arbiters.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_arbiters.yml b/source/server-discovery-and-monitoring/tests/rs/discover_arbiters.yml
@@ -35,7 +35,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_passives.json b/source/server-discovery-and-monitoring/tests/rs/discover_passives.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 
@@ -36,7 +35,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_passives.yml b/source/server-discovery-and-monitoring/tests/rs/discover_passives.yml
@@ -35,7 +35,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     },
@@ -72,7 +71,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_primary.json b/source/server-discovery-and-monitoring/tests/rs/discover_primary.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_primary.yml b/source/server-discovery-and-monitoring/tests/rs/discover_primary.yml
@@ -34,7 +34,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_secondary.json b/source/server-discovery-and-monitoring/tests/rs/discover_secondary.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": null, 

diff --git a/source/server-discovery-and-monitoring/tests/rs/discover_secondary.yml b/source/server-discovery-and-monitoring/tests/rs/discover_secondary.yml
@@ -35,7 +35,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetNoPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/discovery.json b/source/server-discovery-and-monitoring/tests/rs/discovery.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 
@@ -40,7 +39,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 
@@ -82,7 +80,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "b:27017": {
                         "setName": "rs", 
@@ -123,7 +120,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "b:27017": {
                         "setName": "rs", 

diff --git a/source/server-discovery-and-monitoring/tests/rs/discovery.yml b/source/server-discovery-and-monitoring/tests/rs/discovery.yml
@@ -42,7 +42,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetNoPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     },
@@ -92,7 +91,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetNoPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     },
@@ -141,7 +139,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     },
@@ -192,7 +189,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/equal_electionids.json b/source/server-discovery-and-monitoring/tests/rs/equal_electionids.json
@@ -3,9 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": {
-                    "$oid": "000000000000000000000001"
-                }, 
                 "servers": {
                     "a:27017": {
                         "electionId": null, 

diff --git a/source/server-discovery-and-monitoring/tests/rs/equal_electionids.yml b/source/server-discovery-and-monitoring/tests/rs/equal_electionids.yml
@@ -39,7 +39,6 @@ phases: [
             },
             topologyType: "ReplicaSetWithPrimary",
             setName: "rs",
-            maxElectionId: {"$oid": "000000000000000000000001"}
         }
     }
 ]
diff --git a/source/server-discovery-and-monitoring/tests/rs/ghost_discovered.json b/source/server-discovery-and-monitoring/tests/rs/ghost_discovered.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": null, 

diff --git a/source/server-discovery-and-monitoring/tests/rs/ghost_discovered.yml b/source/server-discovery-and-monitoring/tests/rs/ghost_discovered.yml
@@ -33,7 +33,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetNoPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.json b/source/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "b:27017": {
                         "setName": null, 

diff --git a/source/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.yml b/source/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.yml
@@ -28,7 +28,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetNoPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/ignore_secondary_electionid.json b/source/server-discovery-and-monitoring/tests/rs/ignore_secondary_electionid.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "electionId": {

diff --git a/source/server-discovery-and-monitoring/tests/rs/ignore_secondary_electionid.yml b/source/server-discovery-and-monitoring/tests/rs/ignore_secondary_electionid.yml
@@ -28,7 +28,6 @@ phases: [
             },
             topologyType: "ReplicaSetNoPrimary",
             setName: "rs",
-            maxElectionId:
         }
     }
 ]
diff --git a/source/server-discovery-and-monitoring/tests/rs/member_reconfig.json b/source/server-discovery-and-monitoring/tests/rs/member_reconfig.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 
@@ -34,7 +33,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 

diff --git a/source/server-discovery-and-monitoring/tests/rs/member_reconfig.yml b/source/server-discovery-and-monitoring/tests/rs/member_reconfig.yml
@@ -34,7 +34,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     },
@@ -63,7 +62,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/member_standalone.json b/source/server-discovery-and-monitoring/tests/rs/member_standalone.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": null, 
@@ -25,7 +24,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 

diff --git a/source/server-discovery-and-monitoring/tests/rs/member_standalone.yml b/source/server-discovery-and-monitoring/tests/rs/member_standalone.yml
@@ -26,7 +26,6 @@ phases: [
             },
 
             topologyType: "Unknown",
-            maxElectionId:,
             setName:
         }
     },
@@ -55,7 +54,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/new_primary.json b/source/server-discovery-and-monitoring/tests/rs/new_primary.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 
@@ -34,7 +33,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": null, 

diff --git a/source/server-discovery-and-monitoring/tests/rs/new_primary.yml b/source/server-discovery-and-monitoring/tests/rs/new_primary.yml
@@ -34,7 +34,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     },
@@ -69,7 +68,6 @@ phases: [
             },
 
             topologyType: "ReplicaSetWithPrimary",
-            maxElectionId:,
             setName: "rs"
         }
     }

diff --git a/source/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.json b/source/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.json
@@ -3,9 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": {
-                    "$oid": "000000000000000000000001"
-                }, 
                 "servers": {
                     "a:27017": {
                         "electionId": {
@@ -43,9 +40,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": {
-                    "$oid": "000000000000000000000002"
-                }, 
                 "servers": {
                     "a:27017": {
                         "electionId": null, 
@@ -83,9 +77,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": {
-                    "$oid": "000000000000000000000002"
-                }, 
                 "servers": {
                     "a:27017": {
                         "electionId": null, 

diff --git a/source/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.yml b/source/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.yml
@@ -31,7 +31,6 @@ phases: [
             },
             topologyType: "ReplicaSetWithPrimary",
             setName: "rs",
-            maxElectionId: {"$oid": "000000000000000000000001"}
         }
     },
 
@@ -62,7 +61,6 @@ phases: [
             },
             topologyType: "ReplicaSetWithPrimary",
             setName: "rs",
-            maxElectionId: {"$oid": "000000000000000000000002"}
         }
     },
 
@@ -92,7 +90,6 @@ phases: [
             },
             topologyType: "ReplicaSetWithPrimary",
             setName: "rs",
-            maxElectionId: {"$oid": "000000000000000000000002"}
         }
     }
 ]
diff --git a/source/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.json b/source/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.json
@@ -3,7 +3,6 @@
     "phases": [
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs", 
@@ -34,7 +33,6 @@
         }, 
         {
             "outcome": {
-                "maxElectionId": null, 
                 "servers": {
                     "a:27017": {
                         "setName": "rs",
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ phases: [ @@
                 },
                 topologyType: "ReplicaSetWithPrimary",
-                maxElectionId:,
                 setName: "rs"
             }
         }
@@ Expand Down @@