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

[Test] LocalExporterTests should wait for exporters to terminate in a finally block (elastic/x-pack-elasticsearch#1581) 

At the end of the test, LocalExporterTests checks if no more monitoring
 data are exporter by checking multiple times the last time nodes_stats
 documents were exported, stopping after 10 seconds. It does this in a
 @After annotated method but it would be better to do this in a finally
 block. Also, it should search for node_stats documents only if the
 monitoring indices exist and are searchable to avoid some "all shards
 failed" failures.

Original commit: elastic/x-pack-elasticsearch@90ffb4affd
This commit is contained in:
Tanguy Leroux 2017-06-02 09:12:49 +02:00 committed by GitHub
parent 922a337884
commit 261bf8d78d
1 changed files with 139 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugin/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTests.java
View File

@ -46,7 +46,6 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat; import org.joda.time.format.ISODateTimeFormat;
import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import java.io.IOException; import java.io.IOException;
@ -66,6 +65,7 @@ import static org.elasticsearch.xpack.monitoring.MonitoredSystem.BEATS;
import static org.elasticsearch.xpack.monitoring.MonitoredSystem.KIBANA; import static org.elasticsearch.xpack.monitoring.MonitoredSystem.KIBANA;
import static org.elasticsearch.xpack.monitoring.MonitoredSystem.LOGSTASH; import static org.elasticsearch.xpack.monitoring.MonitoredSystem.LOGSTASH;
import static org.elasticsearch.xpack.monitoring.exporter.MonitoringTemplateUtils.DATA_INDEX; import static org.elasticsearch.xpack.monitoring.exporter.MonitoringTemplateUtils.DATA_INDEX;
import static org.elasticsearch.xpack.monitoring.exporter.MonitoringTemplateUtils.TEMPLATE_VERSION;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
@ -111,8 +111,7 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
.build(); .build();
} }
@After private void stopMonitoring() throws Exception {
public void stopMonitoring() throws Exception {
// Now disabling the monitoring service, so that no more collection are started // Now disabling the monitoring service, so that no more collection are started
assertAcked(client().admin().cluster().prepareUpdateSettings() assertAcked(client().admin().cluster().prepareUpdateSettings()
.setTransientSettings(Settings.builder().putNull(MonitoringSettings.INTERVAL.getKey()))); .setTransientSettings(Settings.builder().putNull(MonitoringSettings.INTERVAL.getKey())));
@ -122,9 +121,14 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
// node_stats document collected for each node is at least 10 seconds old, corresponding to // node_stats document collected for each node is at least 10 seconds old, corresponding to
// 2 or 3 elapsed collection intervals. // 2 or 3 elapsed collection intervals.
final int elapsedInSeconds = 10; final int elapsedInSeconds = 10;
final DateTime startTime = DateTime.now(DateTimeZone.UTC);
assertBusy(() -> { assertBusy(() -> {
refresh(".monitoring-es-2-*"); IndicesExistsResponse indicesExistsResponse = client().admin().indices().prepareExists(".monitoring-*").get();
SearchResponse response = client().prepareSearch(".monitoring-es-2-*").setTypes("node_stats").setSize(0) if (indicesExistsResponse.isExists()) {
ensureYellow(".monitoring-*");
refresh(".monitoring-es-*");
SearchResponse response = client().prepareSearch(".monitoring-es-*").setTypes("node_stats").setSize(0)
.addAggregation(terms("agg_nodes_ids").field("node_stats.node_id") .addAggregation(terms("agg_nodes_ids").field("node_stats.node_id")
.subAggregation(max("agg_last_time_collected").field("timestamp"))) .subAggregation(max("agg_last_time_collected").field("timestamp")))
.get(); .get();
@ -140,6 +144,9 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
DateTime lastCollection = new DateTime(Math.round(subAggregation.getValue()), DateTimeZone.UTC); DateTime lastCollection = new DateTime(Math.round(subAggregation.getValue()), DateTimeZone.UTC);
assertTrue(lastCollection.plusSeconds(elapsedInSeconds).isBefore(DateTime.now(DateTimeZone.UTC))); assertTrue(lastCollection.plusSeconds(elapsedInSeconds).isBefore(DateTime.now(DateTimeZone.UTC)));
} }
} else {
assertTrue(DateTime.now(DateTimeZone.UTC).isAfter(startTime.plusSeconds(elapsedInSeconds)));
}
}, 30L, TimeUnit.SECONDS); }, 30L, TimeUnit.SECONDS);
// We can now disable the exporters and reset the settings. // We can now disable the exporters and reset the settings.
@ -150,6 +157,7 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
} }
public void testExport() throws Exception { public void testExport() throws Exception {
try {
if (randomBoolean()) { if (randomBoolean()) {
// indexing some random documents // indexing some random documents
IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5];
@ -220,31 +228,31 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
assertThat(client().admin().indices().prepareExists(".monitoring-*").get().isExists(), is(true)); assertThat(client().admin().indices().prepareExists(".monitoring-*").get().isExists(), is(true));
ensureYellow(".monitoring-*"); ensureYellow(".monitoring-*");
assertThat(client().prepareSearch(".monitoring-es-2-*").setTypes("cluster_state") assertThat(client().prepareSearch(".monitoring-es-*").setTypes("cluster_state")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
assertEquals(0L, client().prepareSearch(".monitoring-es-2-*").setTypes("node") assertEquals(0L, client().prepareSearch(".monitoring-es-*").setTypes("node")
.get().getHits().getTotalHits() % numNodes); .get().getHits().getTotalHits() % numNodes);
assertThat(client().prepareSearch(".monitoring-es-2-*").setTypes("cluster_stats") assertThat(client().prepareSearch(".monitoring-es-*").setTypes("cluster_stats")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
assertThat(client().prepareSearch(".monitoring-es-2-*").setTypes("index_recovery") assertThat(client().prepareSearch(".monitoring-es-*").setTypes("index_recovery")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
assertThat(client().prepareSearch(".monitoring-es-2-*").setTypes("index_stats") assertThat(client().prepareSearch(".monitoring-es-*").setTypes("index_stats")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
assertThat(client().prepareSearch(".monitoring-es-2-*").setTypes("indices_stats") assertThat(client().prepareSearch(".monitoring-es-*").setTypes("indices_stats")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
assertThat(client().prepareSearch(".monitoring-es-2-*").setTypes("shards") assertThat(client().prepareSearch(".monitoring-es-*").setTypes("shards")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
assertThat(client().prepareSearch(".monitoring-data-2").setTypes("cluster_info") assertThat(client().prepareSearch(".monitoring-data-2").setTypes("cluster_info")
.get().getHits().getTotalHits(), greaterThan(0L)); .get().getHits().getTotalHits(), greaterThan(0L));
SearchResponse response = client().prepareSearch(".monitoring-es-2-*") SearchResponse response = client().prepareSearch(".monitoring-es-*")
.setTypes("node_stats") .setTypes("node_stats")
.setSize(0) .setSize(0)
.addAggregation(terms("agg_nodes_ids").field("node_stats.node_id")) .addAggregation(terms("agg_nodes_ids").field("node_stats.node_id"))
@ -269,6 +277,11 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
checkMonitoringMappings(); checkMonitoringMappings();
checkMonitoringWatches(); checkMonitoringWatches();
checkMonitoringDocs(); checkMonitoringDocs();
logger.info("All checks passed.");
} finally {
stopMonitoring();
}
} }
/** /**
@ -310,7 +323,7 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
assertEquals("marvel index should have at least 1 alias: " + index, 1, aliases.size()); assertEquals("marvel index should have at least 1 alias: " + index, 1, aliases.size());
String indexDate = index.substring(".marvel-es-1-".length()); String indexDate = index.substring(".marvel-es-1-".length());
String expectedAlias = ".monitoring-es-2-" + indexDate + "-alias"; String expectedAlias = ".monitoring-es-" + TEMPLATE_VERSION + "-" + indexDate + "-alias";
assertEquals(expectedAlias, aliases.get(0).getAlias()); assertEquals(expectedAlias, aliases.get(0).getAlias());
} }
} }
@ -399,7 +412,7 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
expectedIndex.add(".monitoring-data-2"); expectedIndex.add(".monitoring-data-2");
} else { } else {
String dateTime = dateFormatter.print(dateParser.parseDateTime(timestamp)); String dateTime = dateFormatter.print(dateParser.parseDateTime(timestamp));
expectedIndex.add(".monitoring-" + expectedSystem.getSystem() + "-2-" + dateTime); expectedIndex.add(".monitoring-" + expectedSystem.getSystem() + "-" + TEMPLATE_VERSION + "-" + dateTime);
if ("node".equals(type)) { if ("node".equals(type)) {
expectedIndex.add(".monitoring-data-2"); expectedIndex.add(".monitoring-data-2");
@ -417,7 +430,7 @@ public class LocalExporterTests extends MonitoringIntegTestCase {
private static MonitoringBulkDoc createMonitoringBulkDoc(String id) throws IOException { private static MonitoringBulkDoc createMonitoringBulkDoc(String id) throws IOException {
String monitoringId = randomFrom(BEATS, KIBANA, LOGSTASH).getSystem(); String monitoringId = randomFrom(BEATS, KIBANA, LOGSTASH).getSystem();
String monitoringVersion = MonitoringTemplateUtils.TEMPLATE_VERSION; String monitoringVersion = TEMPLATE_VERSION;
MonitoringIndex index = randomFrom(MonitoringIndex.values()); MonitoringIndex index = randomFrom(MonitoringIndex.values());
XContentType xContentType = randomFrom(XContentType.values()); XContentType xContentType = randomFrom(XContentType.values());