From 3aa76795f996adaa497cd7f3efee77be753be07c Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Thu, 12 Nov 2015 14:11:26 +0100 Subject: [PATCH] Marvel: Ensure ClusterStatsTests waits enough for marvel documents The should wait a bit more and refreshes index between each assertBusy() Closes elastic/elasticsearch#729 Original commit: elastic/x-pack-elasticsearch@8ec702c1dc11d125b446b64b75454b0a90d45a52 --- .../agent/renderer/cluster/ClusterStatsTests.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java index 537c3991cea..523ceed3337 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java @@ -9,6 +9,7 @@ import org.elasticsearch.action.admin.cluster.stats.ClusterStatsNodes; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.marvel.agent.collector.cluster.ClusterStatsCollector; +import org.elasticsearch.marvel.agent.collector.indices.IndexStatsCollector; import org.elasticsearch.marvel.agent.settings.MarvelSettings; import org.elasticsearch.marvel.test.MarvelIntegTestCase; import org.elasticsearch.search.SearchHit; @@ -62,16 +63,13 @@ public class ClusterStatsTests extends MarvelIntegTestCase { // ok.. we'll start collecting now... updateMarvelInterval(3L, TimeUnit.SECONDS); - awaitMarvelTemplateInstalled(); + awaitMarvelDocsCount(greaterThan(0L), ClusterStatsCollector.TYPE); assertBusy(new Runnable() { @Override public void run() { - logger.debug("--> searching for marvel [{}] documents", ClusterStatsCollector.TYPE); - SearchResponse response = client().prepareSearch().setTypes(ClusterStatsCollector.TYPE).get(); - assertThat(response.getHits().getTotalHits(), greaterThan(0L)); - logger.debug("--> checking that every document contains the expected fields"); + SearchResponse response = client().prepareSearch().setTypes(ClusterStatsCollector.TYPE).get(); String[] filters = ClusterStatsRenderer.FILTERS; for (SearchHit searchHit : response.getHits().getHits()) { Map fields = searchHit.sourceAsMap(); @@ -80,9 +78,9 @@ public class ClusterStatsTests extends MarvelIntegTestCase { assertContains(filter, fields); } } - - logger.debug("--> cluster stats successfully collected"); } }); + + logger.debug("--> cluster stats successfully collected"); } }