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

Speed up and stabilize monitoring bwc tests 

These tests were failing for me locally with this reproduction
line about 80% of the time:
```
gradle :x-plugins:elasticsearch:integTest -Dtests.seed=660D249EDCC648E5 -Dtests.class=org.elasticsearch.xpack.monitoring.OldMonitoringIndicesBackwardsCompatibilityIT -Dtests.method="testOldIndexes" -Dtests.security.manager=true -Dtests.jvms=12 -Dtests.locale=vi-VN -Dtests.timezone=Arctic/Longyearbyen
```

This was due to the ten second collection interval lining up with the
10 second sleep in `assertBusy`. Eventually the collection interval
lines up in such a way that it take more than ten seconds total to
create the alias for the monitoring index. 😢

This fixes that by dropping the interval to 100ms, making the test
no longer fail with that seed and succeed much more quickly. 😄

Relates to elastic/elasticsearch#3951

Original commit: elastic/x-pack-elasticsearch@b5dfa6ef7d
This commit is contained in:
Nik Everett 2016-11-03 15:42:24 -04:00
parent a4e9f8f501
commit 1926193766
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java
View File

@ -33,6 +33,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static org.elasticsearch.common.unit.TimeValue.timeValueMillis;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
@ -40,7 +41,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.hasKey;
/** /**
* Tests for monitoring indexes created before 5.0. * Tests for monitoring indexes created before {@link Version#CURRENT}.
*/ */
public class OldMonitoringIndicesBackwardsCompatibilityIT extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase { public class OldMonitoringIndicesBackwardsCompatibilityIT extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
private final boolean httpExporter = randomBoolean(); private final boolean httpExporter = randomBoolean();
@ -50,7 +51,9 @@ public class OldMonitoringIndicesBackwardsCompatibilityIT extends AbstractOldXPa
Settings.Builder settings = Settings.builder().put(super.nodeSettings(ord)) Settings.Builder settings = Settings.builder().put(super.nodeSettings(ord))
.put(XPackSettings.MONITORING_ENABLED.getKey(), true) .put(XPackSettings.MONITORING_ENABLED.getKey(), true)
// Don't clean old monitoring indexes - we want to make sure we can load them // Don't clean old monitoring indexes - we want to make sure we can load them
.put(MonitoringSettings.HISTORY_DURATION.getKey(), TimeValue.timeValueHours(1000 * 365 * 24).getStringRep()); .put(MonitoringSettings.HISTORY_DURATION.getKey(), TimeValue.timeValueHours(1000 * 365 * 24).getStringRep())
// Speed up the exporter so we don't have to wait around for it
.put(MonitoringSettings.INTERVAL.getKey(), timeValueMillis(100).getStringRep());
if (httpExporter) { if (httpExporter) {
/* If we want to test the http exporter we have to create it but disable it. We need to create it so we don't use the default /* If we want to test the http exporter we have to create it but disable it. We need to create it so we don't use the default
@ -96,10 +99,12 @@ public class OldMonitoringIndicesBackwardsCompatibilityIT extends AbstractOldXPa
InetSocketAddress address = publishAddress.address(); InetSocketAddress address = publishAddress.address();
Settings.Builder settings = Settings.builder(); Settings.Builder settings = Settings.builder();
setupHttpExporter(settings, address.getPort()); setupHttpExporter(settings, address.getPort());
logger.info("--> Enabling http exporter pointing to [localhost:{}]", address.getPort());
client().admin().cluster().prepareUpdateSettings().setTransientSettings(settings).get(); client().admin().cluster().prepareUpdateSettings().setTransientSettings(settings).get();
} }
IndexStatsResolver resolver = new IndexStatsResolver(MonitoredSystem.ES, Settings.EMPTY); IndexStatsResolver resolver = new IndexStatsResolver(MonitoredSystem.ES, Settings.EMPTY);
logger.info("--> {} Waiting for [{}]", Thread.currentThread().getName(), resolver.indexPattern());
assertBusy(() -> assertTrue(client().admin().indices().prepareExists(resolver.indexPattern()).get().isExists())); assertBusy(() -> assertTrue(client().admin().indices().prepareExists(resolver.indexPattern()).get().isExists()));
SearchResponse firstIndexStats = search(resolver, greaterThanOrEqualTo(10L)); SearchResponse firstIndexStats = search(resolver, greaterThanOrEqualTo(10L));