File tree 2 files changed +6
-2
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle/test
2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -69,7 +69,11 @@ class ClusterConfiguration {
69
69
*/
70
70
@Input
71
71
Closure<Integer > minimumMasterNodes = {
72
- return getNumNodes() > 1 ? getNumNodes() : -1
72
+ if (bwcVersion != null && bwcVersion. before(" 6.5.0" )) {
73
+ return numNodes > 1 ? numNodes : -1
74
+ } else {
75
+ return numNodes > 1 ? numNodes. intdiv(2 ) + 1 : -1
76
+ }
73
77
}
74
78
75
79
@Input
Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ class ClusterFormationTasks {
124
124
nodes. add(node)
125
125
Closure<Map > writeConfigSetup
126
126
Object dependsOn
127
- if (node. nodeVersion. onOrAfter(" 6.5.0-SNAPSHOT " )) {
127
+ if (node. nodeVersion. onOrAfter(" 6.5.0" )) {
128
128
writeConfigSetup = { Map esConfig ->
129
129
// Don't force discovery provider if one is set by the test cluster specs already
130
130
if (esConfig. containsKey(' discovery.zen.hosts_provider' ) == false ) {
You can’t perform that action at this time.
0 commit comments