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

original-brownbear · original-brownbear · commit b2c6f31ced33 · 2018-11-15T23:08:41.000+01: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
@@ -340,7 +340,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
`@@ -340,7 +340,7 @@ class ClusterFormationTasks {`
`340`	`340`	`if (minimumMasterNodes > 0) {`
`341`	`341`	`esConfig['discovery.zen.minimum_master_nodes'] = minimumMasterNodes`
`342`	`342`	`}`
`343`		`- if (node.config.numNodes > 1) {`
	`343`	`+ if (minimumMasterNodes > 1) {`
`344`	`344`	`// don't wait for state.. just start up quickly`
`345`	`345`	`// this will also allow new and old nodes in the BWC case to become the master`
`346`	`346`	`esConfig['discovery.initial_state_timeout'] = '0s'`