DISCOVERY: 0s Initial State Timeout in Tests (#35481)

original-brownbear · web-flow · commit 7919b66e6730 · 2018-11-13T14:19:05.000+02:00
* DISCOVERY: 0s Initial State Timeout in Tests * Don't wait for initial state even with a single node, otherwise the loop writing the discovery file causes that single node to wait for its own transport.ports file for 30s. * Closes #35456
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -343,7 +343,7 @@ class ClusterFormationTasks {
         if (minimumMasterNodes > 0) {
             esConfig['discovery.zen.minimum_master_nodes'] = minimumMasterNodes
         }
-        if (node.config.numNodes > 1) {
+        if (minimumMasterNodes > 1) {
             // don't wait for state.. just start up quickly
             // this will also allow new and old nodes in the BWC case to become the master
             esConfig['discovery.initial_state_timeout'] = '0s'

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ class ClusterFormationTasks {`
`343`	`343`	`if (minimumMasterNodes > 0) {`
`344`	`344`	`esConfig['discovery.zen.minimum_master_nodes'] = minimumMasterNodes`
`345`	`345`	`}`
`346`		`- if (node.config.numNodes > 1) {`
	`346`	`+ if (minimumMasterNodes > 1) {`
`347`	`347`	`// don't wait for state.. just start up quickly`
`348`	`348`	`// this will also allow new and old nodes in the BWC case to become the master`
`349`	`349`	`esConfig['discovery.initial_state_timeout'] = '0s'`