honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InternalTestCluster: when restarting a node we should validate the cluster is formed via the node we just restarted 

This is to deal with potential delays in processing the fact that node was node is restarted.
This commit is contained in:
Boaz Leskes 2016-11-15 17:57:24 +00:00
parent a4e88bb64a
commit d99d02ecc3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
View File

@ -1070,10 +1070,15 @@ public final class InternalTestCluster extends TestCluster {
/** ensure a cluster is form with {@link #nodes}.size() nodes. */ /** ensure a cluster is form with {@link #nodes}.size() nodes. */
private void validateClusterFormed() { private void validateClusterFormed() {
final int size = nodes.size();
String name = randomFrom(random, getNodeNames()); String name = randomFrom(random, getNodeNames());
logger.trace("validating cluster formed via [{}], expecting [{}]", name, size); validateClusterFormed(name);
final Client client = client(name); }
/** ensure a cluster is form with {@link #nodes}.size() nodes, but do so by using the client of the specified node */
private void validateClusterFormed(String viaNode) {
final int size = nodes.size();
logger.trace("validating cluster formed via [{}], expecting [{}]", viaNode, size);
final Client client = client(viaNode);
ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForNodes(Integer.toString(size)).get(); ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForNodes(Integer.toString(size)).get();
if (response.isTimedOut()) { if (response.isTimedOut()) {
logger.warn("failed to wait for a cluster of size [{}], got [{}]", size, response); logger.warn("failed to wait for a cluster of size [{}], got [{}]", size, response);
@ -1485,7 +1490,9 @@ public final class InternalTestCluster extends TestCluster {
if (callback.validateClusterForming() || updateMinMaster) { if (callback.validateClusterForming() || updateMinMaster) {
// we have to validate cluster size if updateMinMaster == true, because we need the // we have to validate cluster size if updateMinMaster == true, because we need the
// second node to join in order to increment min_master_nodes back to 2. // second node to join in order to increment min_master_nodes back to 2.
validateClusterFormed(); // we also have to do via the node that was just restarted as it may be that the master didn't yet process
// the fact it left
validateClusterFormed(nodeAndClient.name);
} }
if (updateMinMaster) { if (updateMinMaster) {
updateMinMasterNodes(masterNodesCount); updateMinMasterNodes(masterNodesCount);