From a45f2bd225a28785fc87211b0678e855a79aab77 Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Fri, 10 Nov 2017 15:07:49 +0100 Subject: [PATCH] Set minimum_master_nodes to all nodes for REST tests (#27344) PR #26911 set minimum_master_nodes from number_of_nodes to (number_of_nodes / 2) + 1 in our REST tests. This has led to test failures (see #27233) as the REST tests only configure the first node in its unicast.hosts pinging list (see explanation here: #27233 (comment)). Until we have a proper fix for this, I'm reverting the change in #26911. --- .../org/elasticsearch/gradle/test/ClusterConfiguration.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy index af84a44233aa3..6ca54e6a2afb9 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy @@ -64,10 +64,10 @@ class ClusterConfiguration { /** * Configuration of the setting discovery.zen.minimum_master_nodes on the nodes. - * In case of more than one node, this defaults to (number of nodes / 2) + 1 + * In case of more than one node, this defaults to the number of nodes */ @Input - Closure minimumMasterNodes = { getNumNodes() > 1 ? getNumNodes().intdiv(2) + 1 : -1 } + Closure minimumMasterNodes = { getNumNodes() > 1 ? getNumNodes() : -1 } @Input String jvmArgs = "-Xms" + System.getProperty('tests.heap.size', '512m') +