&& -> ||

Andrey Ershov · Andrey Ershov · commit a500d20642cd · 2018-12-10T17:38:54.000+01:00
diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
@@ -1729,7 +1729,7 @@ private void restartNode(NodeAndClient nodeAndClient, RestartCallback callback)
             activeDisruptionScheme.applyToNode(nodeAndClient.name, this);
         }
 
-        if (callback.validateClusterForming() && excludedNodeIds.isEmpty() == false) {
+        if (callback.validateClusterForming() || excludedNodeIds.isEmpty() == false) {
             // we have to validate cluster size if updateMinMaster == true, because we need the
             // second node to join in order to increment min_master_nodes back to 2.
             // we also have to do via the node that was just restarted as it may be that the master didn't yet process

Original file line number	Diff line number	Diff line change
`@@ -1729,7 +1729,7 @@ private void restartNode(NodeAndClient nodeAndClient, RestartCallback callback)`
`1729`	`1729`	`activeDisruptionScheme.applyToNode(nodeAndClient.name, this);`
`1730`	`1730`	`}`
`1731`	`1731`
`1732`		`- if (callback.validateClusterForming() && excludedNodeIds.isEmpty() == false) {`
	`1732`	`+ if (callback.validateClusterForming() \|\| excludedNodeIds.isEmpty() == false) {`
`1733`	`1733`	`// we have to validate cluster size if updateMinMaster == true, because we need the`
`1734`	`1734`	`// second node to join in order to increment min_master_nodes back to 2.`
`1735`	`1735`	`// we also have to do via the node that was just restarted as it may be that the master didn't yet process`