From 50d121315b595b82e686632e9de82cf86b87f54a Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Sat, 2 Mar 2013 14:25:45 +0100 Subject: [PATCH] add ability for cluster health to wait for current events to be processed help with tests that run on slow machines --- .../cluster/health/ClusterHealthRequest.java | 26 ++++++-- .../health/ClusterHealthRequestBuilder.java | 6 ++ .../health/TransportClusterHealthAction.java | 29 ++++++++- .../org/elasticsearch/common/Priority.java | 23 +++++++ .../cluster/LocalNodeMasterListenerTests.java | 7 +- .../cluster/MinimumMasterNodesTests.java | 11 ++-- .../cluster/SimpleDataNodesTests.java | 5 +- .../allocation/AwarenessAllocationTests.java | 5 +- .../allocation/ClusterRerouteTests.java | 7 +- .../allocation/FilteringAllocationTests.java | 5 +- .../WriteConsistencyLevelTests.java | 7 +- .../local/LocalGatewayIndexStateTests.java | 49 +++++++------- .../SimpleRecoveryLocalGatewayTests.java | 5 +- .../IndexLifecycleActionTests.java | 3 +- .../indices/IgnoreIndicesTests.java | 9 +-- .../indices/analyze/AnalyzeActionTests.java | 5 +- .../mapping/SimpleDeleteMappingTests.java | 3 +- .../indices/mapping/UpdateMappingTests.java | 3 +- .../settings/UpdateNumberOfReplicasTests.java | 29 +++++---- .../indices/state/SimpleIndexStateTests.java | 5 +- .../indices/stats/SimpleIndexStatsTests.java | 3 +- .../template/SimpleIndexTemplateTests.java | 5 +- .../wamer/LocalGatewayIndicesWarmerTests.java | 7 +- .../wamer/SimpleIndicesWarmerTests.java | 8 +-- .../integration/nested/SimpleNestedTests.java | 19 +++--- .../percolator/SimplePercolatorTests.java | 27 ++++---- .../recovery/FullRollingRestartTests.java | 13 ++-- .../recovery/RecoveryWhileUnderLoadTests.java | 15 +++-- .../integration/recovery/RelocationTests.java | 19 +++--- .../routing/AliasResolveRoutingTests.java | 5 +- .../routing/AliasRoutingTests.java | 11 ++-- .../routing/SimpleRoutingTests.java | 13 ++-- .../basic/TransportSearchFailuresTests.java | 5 +- .../basic/TransportTwoNodesSearchTests.java | 3 +- .../child/SimpleChildQuerySearchTests.java | 33 +++++----- .../compress/SearchSourceCompressTests.java | 3 +- .../search/facet/SimpleFacetsTests.java | 45 ++++++------- .../search/fields/SearchFieldsTests.java | 11 ++-- .../search/geo/GeoBoundingBoxTests.java | 7 +- .../search/geo/GeoDistanceFacetTests.java | 5 +- .../search/geo/GeoDistanceTests.java | 3 +- .../search/geo/GeoShapeIntegrationTests.java | 18 ++--- .../highlight/HighlighterSearchTests.java | 65 ++++++++++--------- .../matchedfilters/MatchedFiltersTests.java | 3 +- .../preference/SearchPreferenceTests.java | 5 +- .../search/query/SimpleQueryTests.java | 37 ++++++----- .../search/scan/SearchScanScrollingTests.java | 3 +- .../search/scan/SearchScanTests.java | 3 +- .../search/scroll/SearchScrollTests.java | 11 ++-- .../search/sort/SimpleSortTests.java | 15 +++-- .../timestamp/SimpleTimestampTests.java | 3 +- .../test/integration/ttl/SimpleTTLTests.java | 3 +- .../test/integration/update/UpdateTests.java | 10 +-- .../validate/SimpleValidateQueryTests.java | 7 +- 54 files changed, 403 insertions(+), 282 deletions(-) diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java index 402e1209789..a8320dca68a 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java @@ -21,6 +21,7 @@ package org.elasticsearch.action.admin.cluster.health; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -37,18 +38,13 @@ import static org.elasticsearch.common.unit.TimeValue.readTimeValue; public class ClusterHealthRequest extends MasterNodeOperationRequest { private String[] indices; - private TimeValue timeout = new TimeValue(30, TimeUnit.SECONDS); - private ClusterHealthStatus waitForStatus; - private int waitForRelocatingShards = -1; - private int waitForActiveShards = -1; - private String waitForNodes = ""; - private boolean local = false; + private Priority waitForEvents = null; ClusterHealthRequest() { } @@ -138,6 +134,15 @@ public class ClusterHealthRequest extends MasterNodeOperationRequest listener) { ((ClusterAdminClient) client).health(request, listener); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java index b88a9207b47..e9667330b18 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -24,6 +24,7 @@ import org.elasticsearch.action.support.master.TransportMasterNodeOperationActio import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.cluster.ProcessedClusterStateUpdateTask; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.IndexRoutingTable; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; @@ -36,6 +37,9 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + /** * */ @@ -72,6 +76,30 @@ public class TransportClusterHealthAction extends TransportMasterNodeOperationAc @Override protected ClusterHealthResponse masterOperation(ClusterHealthRequest request, ClusterState unusedState) throws ElasticSearchException { + long endTime = System.currentTimeMillis() + request.timeout().millis(); + + if (request.waitForEvents() != null) { + final CountDownLatch latch = new CountDownLatch(1); + clusterService.submitStateUpdateTask("cluster_reroute (api)", request.waitForEvents(), new ProcessedClusterStateUpdateTask() { + @Override + public ClusterState execute(ClusterState currentState) { + return currentState; + } + + @Override + public void clusterStateProcessed(ClusterState clusterState) { + latch.countDown(); + } + }); + + try { + latch.await(request.timeout().millis(), TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + // ignore + } + } + + int waitFor = 5; if (request.waitForStatus() == null) { waitFor--; @@ -93,7 +121,6 @@ public class TransportClusterHealthAction extends TransportMasterNodeOperationAc ClusterState clusterState = clusterService.state(); return clusterHealth(request, clusterState); } - long endTime = System.currentTimeMillis() + request.timeout().millis(); while (true) { int waitForCounter = 0; ClusterState clusterState = clusterService.state(); diff --git a/src/main/java/org/elasticsearch/common/Priority.java b/src/main/java/org/elasticsearch/common/Priority.java index 033243c8da8..48178ace514 100644 --- a/src/main/java/org/elasticsearch/common/Priority.java +++ b/src/main/java/org/elasticsearch/common/Priority.java @@ -19,11 +19,30 @@ package org.elasticsearch.common; +import org.elasticsearch.ElasticSearchIllegalArgumentException; + /** * */ public final class Priority implements Comparable { + public static Priority fromByte(byte b) { + switch (b) { + case 0: + return URGENT; + case 1: + return HIGH; + case 2: + return NORMAL; + case 3: + return LOW; + case 4: + return LANGUID; + default: + throw new ElasticSearchIllegalArgumentException("can't find priority for [" + b + "]"); + } + } + public static Priority URGENT = new Priority((byte) 0); public static Priority HIGH = new Priority((byte) 1); public static Priority NORMAL = new Priority((byte) 2); @@ -36,6 +55,10 @@ public final class Priority implements Comparable { this.value = value; } + public byte value() { + return this.value; + } + public int compareTo(Priority p) { return this.value - p.value; } diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/LocalNodeMasterListenerTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/LocalNodeMasterListenerTests.java index 9e40782708d..3c2a351c443 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/LocalNodeMasterListenerTests.java +++ b/src/test/java/org/elasticsearch/test/integration/cluster/LocalNodeMasterListenerTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.LocalNodeMasterListener; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.inject.Inject; @@ -75,7 +76,7 @@ public class LocalNodeMasterListenerTests extends AbstractZenNodesTests { ClusterService clusterService2 = node2.injector().getInstance(ClusterService.class); MasterAwareService testService2 = node2.injector().getInstance(MasterAwareService.class); - ClusterHealthResponse clusterHealth = node2.client().admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse clusterHealth = node2.client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); // the second node should not be the master as node1 is already the master. @@ -84,7 +85,7 @@ public class LocalNodeMasterListenerTests extends AbstractZenNodesTests { node1.close(); - clusterHealth = node2.client().admin().cluster().prepareHealth().setWaitForNodes("1").execute().actionGet(); + clusterHealth = node2.client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("1").execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); // now that node1 is closed, node2 should be elected as master @@ -106,7 +107,7 @@ public class LocalNodeMasterListenerTests extends AbstractZenNodesTests { clusterService1 = node1.injector().getInstance(ClusterService.class); testService1 = node1.injector().getInstance(MasterAwareService.class); - clusterHealth = node2.client().admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet(); + clusterHealth = node2.client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); // now that we started node1 again, a new master should be elected diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java index 8426001db45..13bc3cef2c3 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java +++ b/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.discovery.Discovery; @@ -86,7 +87,7 @@ public class MinimumMasterNodesTests extends AbstractZenNodesTests { logger.info("--> start second node, cluster should be formed"); startNode("node2", settings); - ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); state = client("node1").admin().cluster().prepareState().setLocal(true).execute().actionGet().getState(); @@ -130,7 +131,7 @@ public class MinimumMasterNodesTests extends AbstractZenNodesTests { logger.info("--> starting the previous master node again..."); startNode(masterNodeName, settings); - clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().setWaitForNodes("2").execute().actionGet(); + clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().setWaitForNodes("2").execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); state = client("node1").admin().cluster().prepareState().setLocal(true).execute().actionGet().getState(); @@ -171,7 +172,7 @@ public class MinimumMasterNodesTests extends AbstractZenNodesTests { logger.info("--> starting the previous master node again..."); startNode(nonMasterNodeName, settings); - clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForNodes("2").setWaitForGreenStatus().execute().actionGet(); + clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); state = client("node1").admin().cluster().prepareState().setLocal(true).execute().actionGet().getState(); @@ -243,7 +244,7 @@ public class MinimumMasterNodesTests extends AbstractZenNodesTests { startNode("node3", settings); startNode("node4", settings); - ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForNodes("4").execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("4").execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); state = client("node1").admin().cluster().prepareState().execute().actionGet().getState(); @@ -300,7 +301,7 @@ public class MinimumMasterNodesTests extends AbstractZenNodesTests { startNode(nodeToShutdown, settings); } - clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForNodes("4").execute().actionGet(); + clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("4").execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("Running Cluster Health"); diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java index 468ff7b1452..d143f910555 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java +++ b/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.cluster; import org.elasticsearch.action.UnavailableShardsException; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Requests; +import org.elasticsearch.common.Priority; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -54,7 +55,7 @@ public class SimpleDataNodesTests extends AbstractNodesTests { } startNode("nonData2", settingsBuilder().put("node.data", false).build()); - assertThat(client("nonData1").admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("nonData1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); // still no shard should be allocated try { @@ -66,7 +67,7 @@ public class SimpleDataNodesTests extends AbstractNodesTests { // now, start a node data, and see that it gets with shards startNode("data1", settingsBuilder().put("node.data", true).build()); - assertThat(client("nonData1").admin().cluster().prepareHealth().setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("nonData1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); IndexResponse indexResponse = client("nonData2").index(Requests.indexRequest("test").type("type1").id("1").source(source("1", "test"))).actionGet(); assertThat(indexResponse.getId(), equalTo("1")); diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java index 8ec2743478d..e1bdc04412f 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java +++ b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.IndexRoutingTable; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; @@ -63,7 +64,7 @@ public class AwarenessAllocationTests extends AbstractNodesTests { client("node1").admin().indices().prepareCreate("test1").execute().actionGet(); client("node1").admin().indices().prepareCreate("test2").execute().actionGet(); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> starting 1 node on a different rack"); @@ -75,7 +76,7 @@ public class AwarenessAllocationTests extends AbstractNodesTests { do { Thread.sleep(100); logger.info("--> waiting for no relocation"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("3").setWaitForRelocatingShards(0).execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("3").setWaitForRelocatingShards(0).execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> checking current state"); diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java index 897c3b120e2..af70a86212b 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java +++ b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.allocation.command.AllocateAllocationCommand; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; @@ -94,7 +95,7 @@ public class ClusterRerouteTests extends AbstractNodesTests { assertThat(state.routingNodes().unassigned().size(), equalTo(1)); assertThat(state.routingNodes().node(state.nodes().resolveNode("node1").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING)); - ClusterHealthResponse healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); logger.info("--> get the state, verify shard 1 primary allocated"); @@ -111,7 +112,7 @@ public class ClusterRerouteTests extends AbstractNodesTests { assertThat(state.routingNodes().node(state.nodes().resolveNode("node2").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING)); - healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().setWaitForRelocatingShards(0).execute().actionGet(); + healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().setWaitForRelocatingShards(0).execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); logger.info("--> get the state, verify shard 1 primary moved from node1 to node2"); @@ -153,7 +154,7 @@ public class ClusterRerouteTests extends AbstractNodesTests { assertThat(state.routingNodes().unassigned().size(), equalTo(1)); assertThat(state.routingNodes().node(state.nodes().resolveNode("node1").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING)); - ClusterHealthResponse healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); logger.info("--> get the state, verify shard 1 primary allocated"); diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java index fc2ff5accc2..bad2423b7bb 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java +++ b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.IndexRoutingTable; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.index.query.QueryBuilders; @@ -57,7 +58,7 @@ public class FilteringAllocationTests extends AbstractNodesTests { .setSettings(settingsBuilder().put("index.number_of_replicas", 0)) .execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("--> index some data"); @@ -105,7 +106,7 @@ public class FilteringAllocationTests extends AbstractNodesTests { .setSettings(settingsBuilder().put("index.number_of_replicas", 0)) .execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("--> index some data"); diff --git a/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java b/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java index 1334766a1bc..fe5e15dbdbe 100644 --- a/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java +++ b/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.UnavailableShardsException; import org.elasticsearch.action.WriteConsistencyLevel; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterMethod; @@ -48,7 +49,7 @@ public class WriteConsistencyLevelTests extends AbstractNodesTests { startNode("node1"); client("node1").admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", 2)).execute().actionGet(); - ClusterHealthResponse clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForActiveShards(1).setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForActiveShards(1).setWaitForYellowStatus().execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.YELLOW)); @@ -66,7 +67,7 @@ public class WriteConsistencyLevelTests extends AbstractNodesTests { startNode("node2"); - clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForActiveShards(2).setWaitForYellowStatus().execute().actionGet(); + clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForActiveShards(2).setWaitForYellowStatus().execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.YELLOW)); @@ -87,7 +88,7 @@ public class WriteConsistencyLevelTests extends AbstractNodesTests { startNode("node3"); - clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForActiveShards(3).setWaitForGreenStatus().execute().actionGet(); + clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForActiveShards(3).setWaitForGreenStatus().execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java index b0c0797b929..5dcc07c3185 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java +++ b/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java @@ -27,6 +27,7 @@ import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.routing.ShardRoutingState; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; @@ -82,7 +83,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { .execute().actionGet(); logger.info("--> waiting for yellow status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForActiveShards(5).setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForActiveShards(5).setWaitForYellowStatus().execute().actionGet(); if (health.isTimedOut()) { ClusterStateResponse response = client("node1").admin().cluster().prepareState().execute().actionGet(); System.out.println("" + response); @@ -100,7 +101,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node1", settingsBuilder().put("gateway.type", "local")); logger.info("--> waiting for yellow status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForActiveShards(5).setWaitForYellowStatus().execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForActiveShards(5).setWaitForYellowStatus().execute().actionGet(); if (health.isTimedOut()) { ClusterStateResponse response = client("node1").admin().cluster().prepareState().execute().actionGet(); System.out.println("" + response); @@ -127,7 +128,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareCreate("test").execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); ClusterStateResponse stateResponse = client("node1").admin().cluster().prepareState().execute().actionGet(); @@ -146,7 +147,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { assertThat(stateResponse.getState().routingTable().index("test"), nullValue()); logger.info("--> verifying that the state is green"); - health = client("node1").admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); assertThat(health.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -161,7 +162,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { logger.info("--> creating another index (test2) by indexing into it"); client("node1").prepareIndex("test2", "type1", "1").setSource("field1", "value1").execute().actionGet(); logger.info("--> verifying that the state is green"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); assertThat(health.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -169,7 +170,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareOpen("test").execute().actionGet(); logger.info("--> verifying that the state is green"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); assertThat(health.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -197,7 +198,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node2", settingsBuilder().put("gateway.type", "local").build()); logger.info("--> waiting for two nodes and green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); stateResponse = client("node1").admin().cluster().prepareState().execute().actionGet(); @@ -216,7 +217,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareOpen("test").execute().actionGet(); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); stateResponse = client("node1").admin().cluster().prepareState().execute().actionGet(); @@ -252,7 +253,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node1", settingsBuilder().put("node.data", false).put("gateway.type", "local").put("index.number_of_shards", 2).put("index.number_of_replicas", 1).build()); logger.info("--> waiting for test index to be created"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setIndices("test").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setIndices("test").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify we have an index"); @@ -275,7 +276,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareCreate("test").execute().actionGet(); logger.info("--> waiting for test index to be created"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setIndices("test").setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setIndices("test").setWaitForYellowStatus().execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); client("node1").prepareIndex("test", "type1").setSource("field1", "value1").setTimeout("100ms").execute().actionGet(); @@ -296,7 +297,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").prepareIndex("test", "type1", "1").setSource("field1", "value1").setRefresh(true).execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify 1 doc in the index"); @@ -316,7 +317,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareOpen("test").execute().actionGet(); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify 1 doc in the index"); @@ -345,7 +346,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").prepareIndex("test", "type1", "1").setSource("field1", "value1").setRefresh(true).execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify 1 doc in the index"); @@ -367,7 +368,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node2", settings); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); // spin a bit waiting for the index to exists @@ -381,7 +382,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { logger.info("--> verify that the dangling index exists"); assertThat(client("node1").admin().indices().prepareExists("test").execute().actionGet().isExists(), equalTo(true)); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify the doc is there"); @@ -407,7 +408,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").prepareIndex("test", "type1", "1").setSource("field1", "value1").setRefresh(true).execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify 1 doc in the index"); @@ -429,7 +430,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node2", settings); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); // spin a bit waiting for the index to exists @@ -443,7 +444,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { logger.info("--> verify that the dangling index exists"); assertThat(client("node1").admin().indices().prepareExists("test").execute().actionGet().isExists(), equalTo(true)); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify the index state is closed"); @@ -451,7 +452,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { logger.info("--> open the index"); client("node1").admin().indices().prepareOpen("test").execute().actionGet(); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify the doc is there"); @@ -477,7 +478,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").prepareIndex("test", "type1", "1").setSource("field1", "value1").setRefresh(true).execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify 1 doc in the index"); @@ -499,7 +500,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node2", settings); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); // we need to wait for the allocate dangled to kick in (even though in this case its disabled) @@ -518,7 +519,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node2", settingsBuilder().put(settings).put("gateway.recover_after_nodes", 2).build()); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify that the dangling index does exists now!"); @@ -547,7 +548,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { client("node1").prepareIndex("test", "type1", "1").setSource("field1", "value1").setRefresh(true).execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify 1 doc in the index"); @@ -568,7 +569,7 @@ public class LocalGatewayIndexStateTests extends AbstractNodesTests { startNode("node2", settings); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); logger.info("--> verify that the dangling index does not exists"); diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java index f92d8c9828c..edef318ffcf 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.action.admin.indices.status.IndexShardStatus; import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; import org.elasticsearch.action.admin.indices.status.ShardStatus; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.gateway.Gateway; @@ -421,7 +422,7 @@ public class SimpleRecoveryLocalGatewayTests extends AbstractNodesTests { startNode("node2", settingsBuilder().put("gateway.type", "local").put("path.data", "data/data2").build()); - ClusterHealthResponse health = client("node2").admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse health = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); closeNode("node1"); @@ -429,7 +430,7 @@ public class SimpleRecoveryLocalGatewayTests extends AbstractNodesTests { startNode("node2", settingsBuilder().put("gateway.type", "local").put("path.data", "data/data2").build()); - health = client("node2").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + health = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); assertThat(client("node2").admin().indices().prepareExists("test").execute().actionGet().isExists(), equalTo(true)); diff --git a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java index 78f74d9531f..a6d03f90302 100644 --- a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java @@ -26,6 +26,7 @@ import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.RoutingNode; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; @@ -74,7 +75,7 @@ public class IndexLifecycleActionTests extends AbstractNodesTests { assertThat(createIndexResponse.isAcknowledged(), equalTo(true)); logger.info("Running Cluster Health"); - ClusterHealthResponse clusterHealth = client("server1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client("server1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.YELLOW)); diff --git a/src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java b/src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java index 09a5ab7925c..cc0bd6b85cd 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.block.ClusterBlockException; +import org.elasticsearch.common.Priority; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.test.integration.AbstractNodesTests; @@ -56,7 +57,7 @@ public class IgnoreIndicesTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test1").execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); try { @@ -153,7 +154,7 @@ public class IgnoreIndicesTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test2").execute().actionGet(); - clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); client.prepareSearch("test1", "test2").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet(); @@ -177,14 +178,14 @@ public class IgnoreIndicesTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test1").execute().actionGet(); client.admin().indices().prepareCreate("test2").execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); client.prepareSearch("test1", "test2").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet(); client.admin().indices().prepareClose("test2").execute().actionGet(); - clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); try { diff --git a/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java index 87c7db6ff20..78f774e0c2e 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.indices.analyze; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -63,7 +64,7 @@ public class AnalyzeActionTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 10; i++) { AnalyzeResponse analyzeResponse = client.admin().indices().prepareAnalyze("test", "this is a test").execute().actionGet(); @@ -92,7 +93,7 @@ public class AnalyzeActionTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test") .setType("document").setSource( diff --git a/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java b/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java index 020b8bda408..9b48bfb9cdd 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.common.Priority; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -80,7 +81,7 @@ public class SimpleDeleteMappingTests extends AbstractNodesTests { .endObject()).execute().actionGet(); } - ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); client1.admin().indices().prepareRefresh().execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java b/src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java index b2144a49608..89970731f6f 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java @@ -3,6 +3,7 @@ package org.elasticsearch.test.integration.indices.mapping; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; @@ -42,7 +43,7 @@ public class UpdateMappingTests extends AbstractNodesTests { .put("index.number_of_shards", 2) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); long recCount = 20; for (int rec = 0; rec < recCount; rec++) { diff --git a/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java index 44ed249012f..aca93ed3368 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -73,7 +74,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { client1.admin().indices().create(createIndexRequest("test")).actionGet(); logger.info("Running Cluster Health"); - ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -99,7 +100,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { Thread.sleep(200); logger.info("Running Cluster Health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForYellowStatus().setWaitForActiveShards(10).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().setWaitForActiveShards(10).execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.YELLOW)); @@ -112,7 +113,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { Thread.sleep(100); logger.info("Running Cluster Health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("3").execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("3").execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -130,7 +131,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { Thread.sleep(200); logger.info("Running Cluster Health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("3").execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("3").execute().actionGet(); logger.info("Done Cluster Health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -151,7 +152,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2).put("auto_expand_replicas", "0-all")).execute().actionGet(); logger.info("--> running cluster health"); - ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -163,7 +164,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { startNode("node3"); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -175,7 +176,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { closeNode("node3"); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").setWaitForActiveShards(4).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").setWaitForActiveShards(4).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -187,7 +188,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { closeNode("node2"); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("1").setWaitForActiveShards(2).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("1").setWaitForActiveShards(2).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -202,7 +203,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2).put("auto_expand_replicas", "1-all")).execute().actionGet(); logger.info("--> running cluster health"); - ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -214,7 +215,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { startNode("node3"); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -226,7 +227,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { closeNode("node3"); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").setWaitForActiveShards(4).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").setWaitForActiveShards(4).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -238,7 +239,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { closeNode("node2"); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForYellowStatus().setWaitForNodes("1").setWaitForActiveShards(2).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().setWaitForNodes("1").setWaitForActiveShards(2).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.YELLOW)); @@ -255,7 +256,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2).put("auto_expand_replicas", "0-2")).execute().actionGet(); logger.info("--> running cluster health"); - ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet(); + ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -271,7 +272,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests { client1.admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put("auto_expand_replicas", "0-3")).execute().actionGet(); logger.info("--> running cluster health"); - clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(8).execute().actionGet(); + clusterHealth = client1.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(8).execute().actionGet(); logger.info("--> done cluster health, status " + clusterHealth.getStatus()); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); diff --git a/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java b/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java index 454b7065d2b..410a84ebea0 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java @@ -26,6 +26,7 @@ import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.ShardRoutingState; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.SettingsException; @@ -61,7 +62,7 @@ public class SimpleIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareCreate("test").execute().actionGet(); logger.info("--> waiting for green status"); - ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); ClusterStateResponse stateResponse = client("node1").admin().cluster().prepareState().execute().actionGet(); @@ -94,7 +95,7 @@ public class SimpleIndexStateTests extends AbstractNodesTests { client("node1").admin().indices().prepareOpen("test").execute().actionGet(); logger.info("--> waiting for green status"); - health = client("node1").admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); + health = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet(); assertThat(health.isTimedOut(), equalTo(false)); stateResponse = client("node1").admin().cluster().prepareState().execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java b/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java index 6b26e5099e4..fada49c31c4 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -62,7 +63,7 @@ public class SimpleIndexStatsTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test1").execute().actionGet(); client.admin().indices().prepareCreate("test2").execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); client.prepareIndex("test1", "type1", Integer.toString(1)).setSource("field", "value").execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java index ff989d87f30..1e0b511ee40 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.indices.template; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.indices.IndexTemplateAlreadyExistsException; import org.elasticsearch.test.integration.AbstractNodesTests; @@ -100,7 +101,7 @@ public class SimpleIndexTemplateTests extends AbstractNodesTests { // index something into test_index, will match on both templates client.prepareIndex("test_index", "type1", "1").setSource("field1", "value1", "field2", "value 2").setRefresh(true).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); SearchResponse searchResponse = client.prepareSearch("test_index") .setQuery(termQuery("field1", "value1")) @@ -117,7 +118,7 @@ public class SimpleIndexTemplateTests extends AbstractNodesTests { client.prepareIndex("text_index", "type1", "1").setSource("field1", "value1", "field2", "value 2").setRefresh(true).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); // now only match on one template (template_1) searchResponse = client.prepareSearch("text_index") diff --git a/src/test/java/org/elasticsearch/test/integration/indices/wamer/LocalGatewayIndicesWarmerTests.java b/src/test/java/org/elasticsearch/test/integration/indices/wamer/LocalGatewayIndicesWarmerTests.java index 287b88a1421..c14663c25be 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/wamer/LocalGatewayIndicesWarmerTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/wamer/LocalGatewayIndicesWarmerTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.indices.wamer; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; @@ -73,7 +74,7 @@ public class LocalGatewayIndicesWarmerTests extends AbstractNodesTests { .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)) .execute().actionGet(); - client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client("node1").admin().indices().preparePutWarmer("warmer_1") .setSearchRequest(client("node1").prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "value1"))) @@ -116,7 +117,7 @@ public class LocalGatewayIndicesWarmerTests extends AbstractNodesTests { logger.info("--> starting the node again..."); startNode("node1", settingsBuilder().put("gateway.type", "local")); - ClusterHealthResponse healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + ClusterHealthResponse healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); logger.info("--> verify warmers are recovered"); @@ -152,7 +153,7 @@ public class LocalGatewayIndicesWarmerTests extends AbstractNodesTests { logger.info("--> starting the node again..."); startNode("node1", settingsBuilder().put("gateway.type", "local")); - healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + healthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); logger.info("--> verify warmers are recovered"); diff --git a/src/test/java/org/elasticsearch/test/integration/indices/wamer/SimpleIndicesWarmerTests.java b/src/test/java/org/elasticsearch/test/integration/indices/wamer/SimpleIndicesWarmerTests.java index f194668e34d..fbef359ded2 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/wamer/SimpleIndicesWarmerTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/wamer/SimpleIndicesWarmerTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.indices.wamer; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmerMissingException; @@ -65,7 +66,7 @@ public class SimpleIndicesWarmerTests extends AbstractNodesTests { .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutWarmer("warmer_1") .setSearchRequest(client.prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "value1"))) @@ -102,7 +103,7 @@ public class SimpleIndicesWarmerTests extends AbstractNodesTests { .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); ClusterState clusterState = client.admin().cluster().prepareState().execute().actionGet().getState(); IndexWarmersMetaData warmersMetaData = clusterState.metaData().index("test").custom(IndexWarmersMetaData.TYPE); @@ -153,8 +154,7 @@ public class SimpleIndicesWarmerTests extends AbstractNodesTests { try { client.admin().indices().prepareDeleteWarmer().setIndices("test").setName("foo").execute().actionGet(1000); assert false : "warmer foo should not exist"; - } - catch(IndexWarmerMissingException ex) { + } catch (IndexWarmerMissingException ex) { assertThat(ex.name(), equalTo("foo")); } } diff --git a/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java b/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java index 082f812122d..05eeeeb5657 100644 --- a/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java +++ b/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java @@ -26,6 +26,7 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; @@ -80,7 +81,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); // check on no data, see it works @@ -215,7 +216,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < total; i++) { @@ -276,7 +277,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < total; i++) { @@ -313,7 +314,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder() .startObject() @@ -398,7 +399,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder() .startObject() @@ -508,7 +509,7 @@ public class SimpleNestedTests extends AbstractNodesTests { client.admin().indices().prepareAliases() .addAlias("test", "alias1", FilterBuilders.termFilter("field1", "value1")).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() @@ -566,7 +567,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("field1", "value1") @@ -615,7 +616,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject() .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("field1", 1) @@ -704,7 +705,7 @@ public class SimpleNestedTests extends AbstractNodesTests { .endObject() .endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); // sum: 11 client.prepareIndex("test", "type1", Integer.toString(1)).setSource(jsonBuilder().startObject() diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java index aaff3ab85f5..984646cf7de 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java +++ b/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; @@ -124,10 +125,10 @@ public class SimplePercolatorTests extends AbstractNodesTests { .endObject()) .setRefresh(true) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(2).execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(2).execute().actionGet(); client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); PercolateResponse percolate = client.preparePercolate("test", "type1").setSource(jsonBuilder().startObject().startObject("doc") .field("field1", "value1") @@ -157,7 +158,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> register a query"); client.prepareIndex("_percolator", "test", "kuku") @@ -166,7 +167,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { .field("query", termQuery("field1", "value1")) .endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); for (int i = 0; i < 10; i++) { PercolateResponse percolate = client.preparePercolate("test", "type1").setSource(jsonBuilder().startObject().startObject("doc") @@ -210,7 +211,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> register a query"); client.prepareIndex("_percolator", "test", "kuku") @@ -220,7 +221,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { .endObject()) .setRefresh(true) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); for (int i = 0; i < 10; i++) { IndexResponse index = client.prepareIndex("test", "type1", Integer.toString(i)).setSource("field1", "value1") @@ -270,7 +271,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> register a query 1"); client.prepareIndex("_percolator", "test", "kuku") @@ -280,7 +281,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { .endObject()) .setRefresh(true) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); logger.info("--> register a query 2"); client.prepareIndex("_percolator", "test", "bubu") @@ -322,7 +323,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> register a query 1"); client.prepareIndex("_percolator", "test", "kuku") @@ -332,7 +333,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { .endObject()) .setRefresh(true) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); PercolateResponse percolate = client.preparePercolate("test", "type1").setSource(jsonBuilder().startObject().startObject("doc") .field("field1", "value1") @@ -406,9 +407,9 @@ public class SimplePercolatorTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test") .setSettings(settingsBuilder().put("index.number_of_shards", 2)) - .addMapping("type1",mapping) + .addMapping("type1", mapping) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> register a query"); client.prepareIndex("_percolator", "test", "kuku") @@ -417,7 +418,7 @@ public class SimplePercolatorTests extends AbstractNodesTests { .endObject()) .setRefresh(true) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet(); logger.info("--> percolate a document"); PercolateResponse percolate = client.preparePercolate("test", "type1").setSource(jsonBuilder().startObject() diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java index 008f016a896..7b5b9638bdf 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java +++ b/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java @@ -19,6 +19,7 @@ package org.elasticsearch.test.integration.recovery; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterMethod; @@ -58,14 +59,14 @@ public class FullRollingRestartTests extends AbstractNodesTests { startNode("node3"); // make sure the cluster state is green, and all has been recovered - assertThat(client("node1").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); // now start adding nodes startNode("node4"); startNode("node5"); // make sure the cluster state is green, and all has been recovered - assertThat(client("node1").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("5").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("5").execute().actionGet().isTimedOut(), equalTo(false)); client("node1").admin().indices().prepareRefresh().execute().actionGet(); for (int i = 0; i < 10; i++) { @@ -75,10 +76,10 @@ public class FullRollingRestartTests extends AbstractNodesTests { // now start shutting nodes down closeNode("node1"); // make sure the cluster state is green, and all has been recovered - assertThat(client("node5").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("4").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node5").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("4").execute().actionGet().isTimedOut(), equalTo(false)); closeNode("node2"); // make sure the cluster state is green, and all has been recovered - assertThat(client("node5").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node5").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); client("node5").admin().indices().prepareRefresh().execute().actionGet(); @@ -88,11 +89,11 @@ public class FullRollingRestartTests extends AbstractNodesTests { closeNode("node3"); // make sure the cluster state is green, and all has been recovered - assertThat(client("node5").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node5").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); closeNode("node4"); // make sure the cluster state is green, and all has been recovered - assertThat(client("node5").admin().cluster().prepareHealth().setTimeout("1m").setWaitForYellowStatus().setWaitForRelocatingShards(0).setWaitForNodes("1").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node5").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForYellowStatus().setWaitForRelocatingShards(0).setWaitForNodes("1").execute().actionGet().isTimedOut(), equalTo(false)); client("node5").admin().indices().prepareRefresh().execute().actionGet(); for (int i = 0; i < 10; i++) { diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java index 1b87b77b2a1..35b24acbdd8 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java +++ b/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java @@ -19,6 +19,7 @@ package org.elasticsearch.test.integration.recovery; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -113,7 +114,7 @@ public class RecoveryWhileUnderLoadTests extends AbstractNodesTests { logger.info("--> waiting for GREEN health status ..."); // make sure the cluster state is green, and all has been recovered - assertThat(client("node1").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> waiting for 10000 docs to be indexed ..."); while (client("node1").prepareCount().setQuery(matchAllQuery()).execute().actionGet().getCount() < 10000) { @@ -200,7 +201,7 @@ public class RecoveryWhileUnderLoadTests extends AbstractNodesTests { startNode("node4"); logger.info("--> waiting for GREEN health status ..."); - assertThat(client("node1").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("4").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("4").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> waiting for 15000 docs to be indexed ..."); @@ -292,7 +293,7 @@ public class RecoveryWhileUnderLoadTests extends AbstractNodesTests { startNode("node4"); logger.info("--> waiting for GREEN health status ..."); - assertThat(client("node1").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("4").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("4").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> waiting for 10000 docs to be indexed ..."); @@ -306,24 +307,24 @@ public class RecoveryWhileUnderLoadTests extends AbstractNodesTests { logger.info("--> shutting down [node1] ..."); closeNode("node1"); logger.info("--> waiting for GREEN health status ..."); - assertThat(client("node2").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("3").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> shutting down [node3] ..."); closeNode("node3"); logger.info("--> waiting for GREEN health status ..."); - assertThat(client("node2").admin().cluster().prepareHealth().setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForGreenStatus().setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> shutting down [node4] ..."); closeNode("node4"); logger.info("--> waiting for YELLOW health status ..."); - assertThat(client("node2").admin().cluster().prepareHealth().setTimeout("1m").setWaitForYellowStatus().setWaitForNodes("1").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForYellowStatus().setWaitForNodes("1").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> marking and waiting for indexing threads to stop ..."); stop.set(true); stopLatch.await(); logger.info("--> indexing threads stopped"); - assertThat(client("node2").admin().cluster().prepareHealth().setTimeout("1m").setWaitForYellowStatus().setWaitForNodes("1").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForYellowStatus().setWaitForNodes("1").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("--> refreshing the index"); client("node2").admin().indices().prepareRefresh().execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java index fb11ff18f1d..418b1c6705a 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java +++ b/src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java @@ -28,6 +28,7 @@ import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; @@ -92,7 +93,7 @@ public class RelocationTests extends AbstractNodesTests { logger.info("--> start another node"); startNode("node2"); - ClusterHealthResponse clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("--> relocate the shard from node1 to node2"); @@ -100,9 +101,9 @@ public class RelocationTests extends AbstractNodesTests { .add(new MoveAllocationCommand(new ShardId("test", 0), "node1", "node2")) .execute().actionGet(); - clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); + clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); - clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); + clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("--> verifying count again..."); @@ -223,9 +224,9 @@ public class RelocationTests extends AbstractNodesTests { client("node1").admin().cluster().prepareReroute() .add(new MoveAllocationCommand(new ShardId("test", 0), fromNode, toNode)) .execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); - clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); + clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("--> DONE relocate the shard from {} to {}", fromNode, toNode); } @@ -321,13 +322,13 @@ public class RelocationTests extends AbstractNodesTests { logger.info("--> starting [node2] ..."); startNode("node2"); - ClusterHealthResponse healthResponse = client("node2").admin().cluster().prepareHealth().setWaitForNodes("2").setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse healthResponse = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").setWaitForGreenStatus().execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); logger.info("--> starting [node3] ..."); startNode("node3"); - healthResponse = client("node3").admin().cluster().prepareHealth().setWaitForNodes("3").setWaitForGreenStatus().execute().actionGet(); + healthResponse = client("node3").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("3").setWaitForGreenStatus().execute().actionGet(); assertThat(healthResponse.isTimedOut(), equalTo(false)); final AtomicLong idGenerator = new AtomicLong(); @@ -399,9 +400,9 @@ public class RelocationTests extends AbstractNodesTests { client("node1").admin().cluster().prepareReroute() .add(new MoveAllocationCommand(new ShardId("test", 0), fromNode, toNode)) .execute().actionGet(); - ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); + ClusterHealthResponse clusterHealthResponse = client("node1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); - clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); + clusterHealthResponse = client("node2").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForRelocatingShards(0).setTimeout(ACCEPTABLE_RELOCATION_TIME).execute().actionGet(); assertThat(clusterHealthResponse.isTimedOut(), equalTo(false)); logger.info("--> DONE relocate the shard from {} to {}", fromNode, toNode); } diff --git a/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java b/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java index 08125be49ea..277e30c7293 100644 --- a/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java +++ b/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.routing; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.ClusterService; +import org.elasticsearch.common.Priority; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; @@ -74,7 +75,7 @@ public class AliasResolveRoutingTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test1").execute().actionGet(); client.admin().indices().prepareCreate("test2").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().prepareAliases().addAliasAction(newAddAliasAction("test1", "alias")).execute().actionGet(); client.admin().indices().prepareAliases().addAliasAction(newAddAliasAction("test1", "alias10").routing("0")).execute().actionGet(); @@ -120,7 +121,7 @@ public class AliasResolveRoutingTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test1").execute().actionGet(); client.admin().indices().prepareCreate("test2").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().prepareAliases().addAliasAction(newAddAliasAction("test1", "alias")).execute().actionGet(); client.admin().indices().prepareAliases().addAliasAction(newAddAliasAction("test1", "alias10").routing("0")).execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java b/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java index 65d7a1d7f37..f32f067d72c 100644 --- a/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java +++ b/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.RoutingMissingException; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.integration.AbstractNodesTests; @@ -68,7 +69,7 @@ public class AliasRoutingTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().prepareAliases().addAliasAction(newAddAliasAction("test", "alias0").routing("0")).execute().actionGet(); @@ -154,7 +155,7 @@ public class AliasRoutingTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().prepareAliases() .addAliasAction(newAddAliasAction("test", "alias")) @@ -259,7 +260,7 @@ public class AliasRoutingTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test-a").execute().actionGet(); client.admin().indices().prepareCreate("test-b").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().prepareAliases() .addAliasAction(newAddAliasAction("test-a", "alias-a0").routing("0")) @@ -323,7 +324,7 @@ public class AliasRoutingTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("_routing").field("required", true).endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareIndex("test", "type1", "1").setRouting("0").setSource("field", "value1").setRefresh(true).execute().actionGet(); @@ -370,7 +371,7 @@ public class AliasRoutingTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> creating alias with routing [3]"); diff --git a/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java b/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java index be225408ff6..c183d74fd17 100644 --- a/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java +++ b/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.RoutingMissingException; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.query.QueryBuilders; @@ -68,7 +69,7 @@ public class SimpleRoutingTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareIndex("test", "type1", "1").setRouting("0").setSource("field", "value1").setRefresh(true).execute().actionGet(); @@ -131,7 +132,7 @@ public class SimpleRoutingTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareIndex("test", "type1", "1").setRouting("0").setSource("field", "value1").setRefresh(true).execute().actionGet(); @@ -205,7 +206,7 @@ public class SimpleRoutingTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("_routing").field("required", true).endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareIndex("test", "type1", "1").setRouting("0").setSource("field", "value1").setRefresh(true).execute().actionGet(); @@ -256,7 +257,7 @@ public class SimpleRoutingTests extends AbstractNodesTests { .startObject("_routing").field("required", true).field("path", "routing_field").endObject() .endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareIndex("test", "type1", "1").setSource("field", "value1", "routing_field", "0").setRefresh(true).execute().actionGet(); @@ -292,7 +293,7 @@ public class SimpleRoutingTests extends AbstractNodesTests { .startObject("_routing").field("required", true).field("path", "routing_field").endObject() .endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareBulk().add( @@ -318,7 +319,7 @@ public class SimpleRoutingTests extends AbstractNodesTests { .startObject("_routing").field("required", true).field("path", "routing_field").endObject() .endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> indexing with id [1], and routing [0]"); client.prepareIndex("test", "type1", "1").setSource("field", "value1", "routing_field", 0).execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java b/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java index eaab21cf336..90f90179c49 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java @@ -28,6 +28,7 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.Unicode; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.integration.AbstractNodesTests; @@ -61,7 +62,7 @@ public class TransportSearchFailuresTests extends AbstractNodesTests { .settings(settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 2).put("routing.hash.type", "simple"))) .actionGet(); - client("server1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client("server1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); for (int i = 0; i < 100; i++) { index(client("server1"), Integer.toString(i), "test", i); @@ -84,7 +85,7 @@ public class TransportSearchFailuresTests extends AbstractNodesTests { } startNode("server2"); - assertThat(client("server1").admin().cluster().prepareHealth().setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); + assertThat(client("server1").admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").execute().actionGet().isTimedOut(), equalTo(false)); logger.info("Running Cluster Health"); ClusterHealthResponse clusterHealth = client("server1").admin().cluster().health(clusterHealthRequest("test") diff --git a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java index a9e4e14e7e7..c6417c52a46 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java @@ -26,6 +26,7 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.Unicode; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryBuilders; @@ -74,7 +75,7 @@ public class TransportTwoNodesSearchTests extends AbstractNodesTests { .settings(settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 0).put("routing.hash.type", "simple"))) .actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 100; i++) { index(client("server1"), Integer.toString(i), "test", i); diff --git a/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java index a2c3887bb0d..d109bce7c31 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; @@ -81,7 +82,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -120,7 +121,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -304,7 +305,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -366,7 +367,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -465,7 +466,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 3) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -565,7 +566,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -616,7 +617,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -681,7 +682,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 2) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -717,7 +718,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -748,7 +749,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -801,7 +802,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource( jsonBuilder() .startObject() @@ -845,7 +846,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); @@ -917,7 +918,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 2) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); // Parent 1 and its children client.prepareIndex("test", "parent", "1") @@ -1104,7 +1105,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); SearchResponse response = client.prepareSearch("test") .setQuery(QueryBuilders.hasChildQuery("child", matchQuery("text", "value"))) @@ -1150,7 +1151,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource( jsonBuilder() .startObject() @@ -1195,7 +1196,7 @@ public class SimpleChildQuerySearchTests extends AbstractNodesTests { .put("index.number_of_shards", 2) .put("index.number_of_replicas", 0) ).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("child").setSource(jsonBuilder().startObject().startObject("type") .startObject("_parent").field("type", "parent").endObject() .endObject().endObject()).execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java b/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java index 6de83ecb5e5..5f6e2a42fab 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.search.compress; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.compress.CompressorFactory; import org.elasticsearch.common.compress.lzf.LZFCompressor; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -76,7 +77,7 @@ public class SearchSourceCompressTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1") .startObject("_source").field("compress", compress).endObject() diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java b/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java index 75fc62b433f..f5f9e734dca 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -100,9 +101,9 @@ public class SimpleFacetsTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("tag", "green") @@ -147,9 +148,9 @@ public class SimpleFacetsTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("tag", "green") @@ -202,9 +203,9 @@ public class SimpleFacetsTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("stag", "111") @@ -267,7 +268,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { } client.admin().indices().prepareCreate("test1").execute().actionGet(); client.admin().indices().prepareCreate("test2").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test1", "type1").setSource(jsonBuilder().startObject() .field("stag", "111") @@ -316,7 +317,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("stag", "111") @@ -375,7 +376,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("dstag").field("type", "double").endObject() .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("stag", "111") @@ -428,7 +429,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("dstag").field("type", "double").endObject() .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("stag", "111") @@ -783,9 +784,9 @@ public class SimpleFacetsTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); // at the end of the index, we should have 10 of each `bar`, `foo`, and `baz` for (int i = 0; i < 5; i++) { @@ -837,7 +838,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("multi_num").field("type", "float").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("num", 1) @@ -940,7 +941,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("num").field("type", "integer").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("num", 100) .endObject()).execute().actionGet(); @@ -992,7 +993,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("date").field("type", "date").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("num", 1055) @@ -1166,7 +1167,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("date").field("type", "date").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("num", 1055) @@ -1336,7 +1337,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("date").field("type", "date").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("date", "2009-03-05T01:01:01") @@ -1455,7 +1456,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("date").field("type", "date").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("date", "2009-03-05T23:31:01") @@ -1527,7 +1528,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("multi_num").field("type", "float").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("field", "xxx") @@ -1718,7 +1719,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("multi_num").field("type", "integer").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("lField", 100l) @@ -1795,7 +1796,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { .startObject("num").field("type", "float").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 20; i++) { client.prepareIndex("test", "type1", Integer.toString(i)).setSource("num", i % 10).execute().actionGet(); @@ -1832,7 +1833,7 @@ public class SimpleFacetsTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 20; i++) { client.prepareIndex("test", "type1", Integer.toString(i)).setSource("num", i % 10).execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java b/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java index 7c09e89d1ba..a012d3f3c4f 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.search.fields; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.Base64; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.MapBuilder; @@ -74,7 +75,7 @@ public class SearchFieldsTests extends AbstractNodesTests { public void testStoredFields() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").startObject("properties") .startObject("field1").field("type", "string").field("store", "yes").endObject() @@ -132,7 +133,7 @@ public class SearchFieldsTests extends AbstractNodesTests { public void testScriptDocAndFields() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").startObject("properties") .startObject("num1").field("type", "double").field("store", "yes").endObject() @@ -200,7 +201,7 @@ public class SearchFieldsTests extends AbstractNodesTests { public void testScriptFieldUsingSource() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1") .setSource(jsonBuilder().startObject() @@ -250,7 +251,7 @@ public class SearchFieldsTests extends AbstractNodesTests { public void testPartialFields() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(XContentFactory.jsonBuilder().startObject() @@ -288,7 +289,7 @@ public class SearchFieldsTests extends AbstractNodesTests { public void testStoredFieldsWithoutSource() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").startObject("properties") .startObject("_source").field("enabled", false).endObject() diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java index 4b0afd99117..fc22ccbfd7c 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.geo; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; import org.elasticsearch.test.integration.AbstractNodesTests; @@ -71,7 +72,7 @@ public class GeoBoundingBoxTests extends AbstractNodesTests { .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("name", "New York") @@ -146,7 +147,7 @@ public class GeoBoundingBoxTests extends AbstractNodesTests { .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("index.number_of_shards", "1")).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .startObject("location").field("lat", 40).field("lon", -20).endObject() @@ -254,7 +255,7 @@ public class GeoBoundingBoxTests extends AbstractNodesTests { .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("index.number_of_shards", "1")).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("userid", 880) diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java index 023c9a62d44..ed4f6f9226b 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.geo; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet; @@ -72,7 +73,7 @@ public class GeoDistanceFacetTests extends AbstractNodesTests { .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); // to NY: 0 client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() @@ -234,7 +235,7 @@ public class GeoDistanceFacetTests extends AbstractNodesTests { .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("num", 1) diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java index 053c62005fd..51b4c74015c 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.geo; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; @@ -74,7 +75,7 @@ public class GeoDistanceTests extends AbstractNodesTests { .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("name", "New York") diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java index 3a8404792e5..1f5cba7da29 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.search.geo; import com.spatial4j.core.shape.Shape; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.geo.GeoJSONShapeSerializer; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -70,7 +71,7 @@ public class GeoShapeIntegrationTests extends AbstractNodesTests { .endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("name", "Document 1") @@ -110,7 +111,8 @@ public class GeoShapeIntegrationTests extends AbstractNodesTests { assertThat(searchResponse.getHits().getAt(0).id(), equalTo("1")); } - @Test(enabled=false) // LUCENE MONITIR enable this test again once Lucene4.2 is out. This bug is fixed in Lucene 4.2 + @Test(enabled = false) + // LUCENE MONITIR enable this test again once Lucene4.2 is out. This bug is fixed in Lucene 4.2 public void testEdgeCases() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); @@ -121,17 +123,17 @@ public class GeoShapeIntegrationTests extends AbstractNodesTests { .endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "blakely").setSource(jsonBuilder().startObject() .field("name", "Blakely Island") .startObject("location") .field("type", "polygon") .startArray("coordinates").startArray() - .startArray().value(-122.83).value(48.57).endArray() - .startArray().value(-122.77).value(48.56).endArray() - .startArray().value(-122.79).value(48.53).endArray() - .startArray().value(-122.83).value(48.57).endArray() // close the polygon + .startArray().value(-122.83).value(48.57).endArray() + .startArray().value(-122.77).value(48.56).endArray() + .startArray().value(-122.79).value(48.53).endArray() + .startArray().value(-122.83).value(48.57).endArray() // close the polygon .endArray().endArray() .endObject() .endObject()).execute().actionGet(); @@ -163,7 +165,7 @@ public class GeoShapeIntegrationTests extends AbstractNodesTests { .endObject().endObject() .endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("name", "Document 1") diff --git a/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java index df7df2b3447..495c17fc794 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.ImmutableSettings.Builder; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -663,7 +664,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource("title", "this is a test").execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); @@ -704,7 +705,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource("title", "this is a test").execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); @@ -745,7 +746,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource("title", "this is a test").execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); @@ -786,7 +787,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource("title", "this is a test").execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); @@ -949,7 +950,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { assertThat(response.getHits().hits()[0].highlightFields().get("tags").fragments()[0].string(), equalTo("this is a really long tag i would like to highlight")); assertThat(response.getHits().hits()[0].highlightFields().get("tags").fragments()[1].string(), equalTo("here is another one that is very long and has the tag token near the end")); } - + @Test public void testCommonTermsQuery() { try { @@ -976,7 +977,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { assertThat(searchResponse.getHits().getAt(0).highlightFields().get("field2").fragments()[0].string(), equalTo("The quick brown fox jumps over the lazy dog")); } - + @Test public void testCommonTermsTermVector() throws ElasticSearchException, IOException { try { @@ -1002,8 +1003,8 @@ public class HighlighterSearchTests extends AbstractNodesTests { assertThat(searchResponse.getHits().getAt(0).highlightFields().get("field2").fragments()[0].string(), equalTo("The quick brown fox jumps over the lazy dog")); } - - + + @Test public void testPhrasePrefix() throws ElasticSearchException, IOException { try { @@ -1016,16 +1017,16 @@ public class HighlighterSearchTests extends AbstractNodesTests { builder.putArray("index.analysis.analyzer.synonym.filter", "synonym", "lowercase"); builder.put("index.analysis.filter.synonym.type", "synonym"); builder.putArray("index.analysis.filter.synonym.synonyms", "quick => fast"); - + XContentBuilder type2Mapping = XContentFactory.jsonBuilder().startObject().startObject("type2") - .startObject("_all").field("store", "yes").field("termVector", "with_positions_offsets").endObject() - .startObject("properties") - .startObject("field4").field("type", "string").field("termVector", "with_positions_offsets").field("analyzer", "synonym").endObject() - .startObject("field3").field("type", "string").field("analyzer", "synonym").endObject() - .endObject() - .endObject().endObject(); - - + .startObject("_all").field("store", "yes").field("termVector", "with_positions_offsets").endObject() + .startObject("properties") + .startObject("field4").field("type", "string").field("termVector", "with_positions_offsets").field("analyzer", "synonym").endObject() + .startObject("field3").field("type", "string").field("analyzer", "synonym").endObject() + .endObject() + .endObject().endObject(); + + client.admin().indices().prepareCreate("test").setSettings(builder.build()).addMapping("type1", type1TermVectorMapping()).addMapping("type2", type2Mapping).execute().actionGet(); client.admin().cluster().prepareHealth("test").setWaitForGreenStatus().execute().actionGet(); @@ -1033,11 +1034,11 @@ public class HighlighterSearchTests extends AbstractNodesTests { .setSource("field0", "The quick brown fox jumps over the lazy dog", "field1", "The quick brown fox jumps over the lazy dog") .setRefresh(true).execute().actionGet(); client.prepareIndex("test", "type1", "1") - .setSource("field1", "The quick browse button is a fancy thing, right bro?") - .setRefresh(true).execute().actionGet(); + .setSource("field1", "The quick browse button is a fancy thing, right bro?") + .setRefresh(true).execute().actionGet(); logger.info("--> highlighting and searching on field0"); SearchSourceBuilder source = searchSource() - .query(matchPhrasePrefixQuery("field0", "quick bro" )) + .query(matchPhrasePrefixQuery("field0", "quick bro")) .from(0).size(60).explain(true) .highlight(highlight().field("field0").order("score").preTags("").postTags("")); @@ -1046,10 +1047,10 @@ public class HighlighterSearchTests extends AbstractNodesTests { assertThat(searchResponse.getHits().totalHits(), equalTo(1l)); assertThat(searchResponse.getHits().getAt(0).highlightFields().get("field0").fragments()[0].string(), equalTo("The quick brown fox jumps over the lazy dog")); - + logger.info("--> highlighting and searching on field1"); source = searchSource() - .query(matchPhrasePrefixQuery("field1","quick bro" )) + .query(matchPhrasePrefixQuery("field1", "quick bro")) .from(0).size(60).explain(true) .highlight(highlight().field("field1").order("score").preTags("").postTags("")); @@ -1059,17 +1060,17 @@ public class HighlighterSearchTests extends AbstractNodesTests { assertThat(searchResponse.getHits().getAt(0).highlightFields().get("field1").fragments()[0].string(), equalTo("The quick browse button is a fancy thing, right bro?")); assertThat(searchResponse.getHits().getAt(1).highlightFields().get("field1").fragments()[0].string(), equalTo("The quick brown fox jumps over the lazy dog")); - + // with synonyms client.prepareIndex("test", "type2", "0") - .setSource("field4", "The quick brown fox jumps over the lazy dog", "field3", "The quick brown fox jumps over the lazy dog") - .setRefresh(true).execute().actionGet(); + .setSource("field4", "The quick brown fox jumps over the lazy dog", "field3", "The quick brown fox jumps over the lazy dog") + .setRefresh(true).execute().actionGet(); client.prepareIndex("test", "type2", "1") - .setSource("field4", "The quick browse button is a fancy thing, right bro?").setRefresh(true).execute().actionGet(); + .setSource("field4", "The quick browse button is a fancy thing, right bro?").setRefresh(true).execute().actionGet(); client.prepareIndex("test", "type2", "2") - .setSource("field4", "a quick fast blue car") - .setRefresh(true).execute().actionGet(); - + .setSource("field4", "a quick fast blue car") + .setRefresh(true).execute().actionGet(); + source = searchSource().filter(FilterBuilders.typeFilter("type2")).query(matchPhrasePrefixQuery("field3", "fast bro")).from(0).size(60).explain(true) .highlight(highlight().field("field3").order("score").preTags("").postTags("")); @@ -1092,7 +1093,7 @@ public class HighlighterSearchTests extends AbstractNodesTests { equalTo("The quick browse button is a fancy thing, right bro?")); assertThat(searchResponse.getHits().getAt(1).highlightFields().get("field4").fragments()[0].string(), equalTo("The quick brown fox jumps over the lazy dog")); - + logger.info("--> highlighting and searching on field4"); source = searchSource().filter(FilterBuilders.typeFilter("type2")).query(matchPhrasePrefixQuery("field4", "a fast quick blue ca")).from(0).size(60).explain(true) .highlight(highlight().field("field4").order("score").preTags("").postTags("")); @@ -1103,9 +1104,9 @@ public class HighlighterSearchTests extends AbstractNodesTests { assertThat(searchResponse.getHits().getAt(0).highlightFields().get("field4").fragments()[0].string(), equalTo("a quick fast blue car")); - + } - + @Test public void testPlainHighlightDifferentFragmenter() throws Exception { try { diff --git a/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java b/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java index f699b6982ec..f696f3750cb 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.matchedfilters; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.search.SearchHit; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; @@ -68,7 +69,7 @@ public class MatchedFiltersTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("name", "test1") diff --git a/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java b/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java index 491ac5dcc8a..40d8418ac3b 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.preference; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; @@ -61,7 +62,7 @@ public class SearchPreferenceTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource("field1", "value1").execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); @@ -80,7 +81,7 @@ public class SearchPreferenceTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource("field1", "value1").execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java index 2e81aca58b3..f44c44c3ea9 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.search.query; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.*; @@ -479,7 +480,7 @@ public class SimpleQueryTests extends AbstractNodesTests { client.prepareIndex("test", "type1", "1").setSource("field1", "value1").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.admin().indices().prepareRefresh().execute().actionGet(); @@ -824,12 +825,12 @@ public class SimpleQueryTests extends AbstractNodesTests { assertThat(searchResponse.getHits().getHits()[0].getId(), anyOf(equalTo("2"), equalTo("4"))); assertThat(searchResponse.getHits().getHits()[1].getId(), anyOf(equalTo("2"), equalTo("4"))); } - + @Test public void testBasicFilterById() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("field1", "value1") @@ -851,38 +852,38 @@ public class SimpleQueryTests extends AbstractNodesTests { searchResponse = client.prepareSearch().setQuery(matchAllQuery()).setFilter(FilterBuilders.idsFilter().ids("1")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(matchAllQuery()).setFilter(FilterBuilders.idsFilter().ids("1", "2")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l)); assertThat(searchResponse.getHits().hits().length, equalTo(2)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.constantScoreQuery(FilterBuilders.idsFilter().ids("1", "2"))).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l)); assertThat(searchResponse.getHits().hits().length, equalTo(2)); - - + + searchResponse = client.prepareSearch().setQuery(QueryBuilders.constantScoreQuery(FilterBuilders.idsFilter("type1").ids("1", "2"))).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.constantScoreQuery(FilterBuilders.idsFilter().ids("1"))).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.constantScoreQuery(FilterBuilders.idsFilter(null).ids("1"))).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.constantScoreQuery(FilterBuilders.idsFilter("type1", "type2", "type3").ids("1", "2", "3", "4"))).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l)); assertThat(searchResponse.getHits().hits().length, equalTo(2)); } - + @Test public void testBasicQueryById() throws Exception { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("field1", "value1") @@ -900,24 +901,24 @@ public class SimpleQueryTests extends AbstractNodesTests { searchResponse = client.prepareSearch().setQuery(QueryBuilders.idsQuery().ids("1")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.idsQuery().ids("1", "2")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l)); assertThat(searchResponse.getHits().hits().length, equalTo(2)); - - + + searchResponse = client.prepareSearch().setQuery(QueryBuilders.idsQuery("type1").ids("1", "2")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.idsQuery().ids("1")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.idsQuery(null).ids("1")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - + searchResponse = client.prepareSearch().setQuery(QueryBuilders.idsQuery("type1", "type2", "type3").ids("1", "2", "3", "4")).execute().actionGet(); assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l)); assertThat(searchResponse.getHits().hits().length, equalTo(2)); diff --git a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java b/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java index fafc9a0b00f..84eb965ae02 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java @@ -23,6 +23,7 @@ import com.google.common.collect.Sets; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; @@ -204,7 +205,7 @@ public class SearchScanScrollingTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", numberOfShards)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); Set ids = Sets.newHashSet(); Set expectedIds = Sets.newHashSet(); diff --git a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java b/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java index ae02460b175..caa6ee9f182 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java @@ -23,6 +23,7 @@ import com.google.common.collect.Sets; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; @@ -67,7 +68,7 @@ public class SearchScanTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 5)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); Set ids = Sets.newHashSet(); diff --git a/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java b/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java index 75e368a8457..38e9b35d408 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.search.scroll; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; @@ -70,9 +71,9 @@ public class SearchScrollTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 3)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 100; i++) { client.prepareIndex("test", "type1", Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).execute().actionGet(); @@ -124,9 +125,9 @@ public class SearchScrollTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 3)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 100; i++) { String routing = "0"; @@ -199,7 +200,7 @@ public class SearchScrollTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 5)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 500; i++) { client.prepareIndex("test", "tweet", Integer.toString(i)).setSource( diff --git a/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java index e147378d151..b18adb125a3 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java +++ b/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.text.Text; @@ -77,7 +78,7 @@ public class SimpleSortTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("id", "1") @@ -126,7 +127,7 @@ public class SimpleSortTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type", "1").setSource("field", 2).execute().actionGet(); client.prepareIndex("test", "type", "2").setSource("field", 1).execute().actionGet(); @@ -188,7 +189,7 @@ public class SimpleSortTests extends AbstractNodesTests { .startObject("double_value").field("type", "double").endObject() .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); for (int i = 0; i < 10; i++) { client.prepareIndex("test", "type1", Integer.toString(i)).setSource(jsonBuilder().startObject() @@ -439,7 +440,7 @@ public class SimpleSortTests extends AbstractNodesTests { .startObject("svalue").field("type", "string").endObject() .endObject().endObject().endObject().string(); client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject() .field("id", "1") @@ -518,7 +519,7 @@ public class SimpleSortTests extends AbstractNodesTests { // ignore } client.admin().indices().prepareCreate("test").execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() .field("id", "1") @@ -585,7 +586,7 @@ public class SimpleSortTests extends AbstractNodesTests { .field("d_value", -1.1) .endObject()).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet(); logger.info("--> sort with an unmapped field, verify it fails"); try { @@ -625,7 +626,7 @@ public class SimpleSortTests extends AbstractNodesTests { .startObject("string_values").field("type", "string").field("index", "not_analyzed").endObject() .endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.prepareIndex("test", "type1", Integer.toString(1)).setSource(jsonBuilder().startObject() .array("long_values", 1l, 5l, 10l, 8l) diff --git a/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java b/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java index a7956125c4a..11f78750e3e 100644 --- a/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java +++ b/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.timestamp; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; @@ -60,7 +61,7 @@ public class SimpleTimestampTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("_timestamp").field("enabled", true).field("store", "yes").endObject().endObject().endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); logger.info("--> check with automatic timestamp"); long now1 = System.currentTimeMillis(); diff --git a/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java b/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java index 4ab7c6a24e7..b8084970aad 100644 --- a/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java +++ b/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.ttl; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.test.integration.AbstractNodesTests; @@ -80,7 +81,7 @@ public class SimpleTTLTests extends AbstractNodesTests { .endObject() .endObject()) .execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); long providedTTLValue = 3000; logger.info("--> checking ttl"); // Index one doc without routing, one doc with routing, one doc with not TTL and no default and one doc with default TTL diff --git a/src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java b/src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java index c46e67c80cd..3acc0eb6795 100644 --- a/src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java +++ b/src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; @@ -165,7 +166,7 @@ public class UpdateTests extends AbstractNodesTests { @Test public void testUpsert() throws Exception { createIndex(); - ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -193,7 +194,7 @@ public class UpdateTests extends AbstractNodesTests { @Test public void testUpsertFields() throws Exception { createIndex(); - ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -236,10 +237,11 @@ public class UpdateTests extends AbstractNodesTests { assertThat(updateResponse.getGetResult().sourceAsMap().get("bar").toString(), equalTo("baz")); assertThat(updateResponse.getGetResult().sourceAsMap().get("extra"), nullValue()); } + @Test public void testUpdate() throws Exception { createIndex(); - ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); @@ -295,7 +297,7 @@ public class UpdateTests extends AbstractNodesTests { .endObject()) .setRefresh(true) .execute().actionGet(); - clusterHealth = client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + clusterHealth = client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); assertThat(clusterHealth.isTimedOut(), equalTo(false)); assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); updateResponse = client.prepareUpdate("test", "type1", "1").setScript("ctx._source.field += 1").setPercolate("*").execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java b/src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java index 0173a18314e..d6cf0fc4df2 100644 --- a/src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java +++ b/src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.validate; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.DistanceUnit; @@ -68,7 +69,7 @@ public class SimpleValidateQueryTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("type1") .setSource(XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .startObject("foo").field("type", "string").endObject() @@ -95,7 +96,7 @@ public class SimpleValidateQueryTests extends AbstractNodesTests { client.admin().indices().prepareDelete().execute().actionGet(); client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("type1") .setSource(XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .startObject("foo").field("type", "string").endObject() @@ -209,7 +210,7 @@ public class SimpleValidateQueryTests extends AbstractNodesTests { client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder() .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0)).execute().actionGet(); - client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client.admin().indices().preparePutMapping("test").setType("type1") .setSource(XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .startObject("foo").field("type", "string").endObject()