ElectMasterService.hasEnoughMasterNodes should return false if no masters were found

bleskes · bleskes · commit 8758c541b35b · 2017-04-19T09:52:06.000+02:00
This is a regression introduced in #20063
diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java b/core/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java
@@ -150,7 +150,8 @@ public DiscoveryNode tieBreakActiveMasters(Collection<DiscoveryNode> activeMaste
     }
 
     public boolean hasEnoughMasterNodes(Iterable<DiscoveryNode> nodes) {
-        return minimumMasterNodes < 1 || countMasterNodes(nodes) >= minimumMasterNodes;
+        final int count = countMasterNodes(nodes);
+        return count > 0 && (minimumMasterNodes < 0 || count >= minimumMasterNodes);
     }
 
     public boolean hasTooManyMasterNodes(Iterable<DiscoveryNode> nodes) {

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ public DiscoveryNode tieBreakActiveMasters(Collection<DiscoveryNode> activeMaste`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`public boolean hasEnoughMasterNodes(Iterable<DiscoveryNode> nodes) {`
`153`		`- return minimumMasterNodes < 1 \|\| countMasterNodes(nodes) >= minimumMasterNodes;`
	`153`	`+ final int count = countMasterNodes(nodes);`
	`154`	`+ return count > 0 && (minimumMasterNodes < 0 \|\| count >= minimumMasterNodes);`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`public boolean hasTooManyMasterNodes(Iterable<DiscoveryNode> nodes) {`