CR: Don't depend on the seed node starting up for other nodes to start in 6.5.0+

original-brownbear · original-brownbear · commit 391a8a6afd56 · 2018-10-20T16:07:15.000+02:00
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -122,7 +122,7 @@ class ClusterFormationTasks {
             }
             NodeInfo node = new NodeInfo(config, i, project, prefix, elasticsearchVersion, sharedDir)
             nodes.add(node)
-            Object dependsOn = startTasks.empty ? startDependencies : startTasks.get(0)
+            Object dependsOn = startTasks.empty || node.nodeVersion.onOrAfter("6.5.0-SNAPSHOT") ? startDependencies : startTasks.get(0)
             startTasks.add(configureNode(project, prefix, runner, dependsOn, node, config, distro, nodes.get(0)))
         }
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class ClusterFormationTasks {`
`122`	`122`	`}`
`123`	`123`	`NodeInfo node = new NodeInfo(config, i, project, prefix, elasticsearchVersion, sharedDir)`
`124`	`124`	`nodes.add(node)`
`125`		`- Object dependsOn = startTasks.empty ? startDependencies : startTasks.get(0)`
	`125`	`+ Object dependsOn = startTasks.empty \|\| node.nodeVersion.onOrAfter("6.5.0-SNAPSHOT") ? startDependencies : startTasks.get(0)`
`126`	`126`	`startTasks.add(configureNode(project, prefix, runner, dependsOn, node, config, distro, nodes.get(0)))`
`127`	`127`	`}`
`128`	`128`