From 1d525f998cb040a643d3caa31fde9cca34a117a8 Mon Sep 17 00:00:00 2001 From: Tom Veasey Date: Wed, 14 Mar 2018 10:59:25 +0000 Subject: [PATCH] Model memory has increased so we need to update some integration test thresholds (elastic/x-pack-elasticsearch#4033) Original commit: elastic/x-pack-elasticsearch@f9b77230cee1e06a24be2905e7136523e3bcb39f --- .../ml/integration/AutodetectMemoryLimitIT.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java b/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java index cfb1fe56e43..c46b1d1c868 100644 --- a/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java +++ b/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java @@ -37,7 +37,6 @@ public class AutodetectMemoryLimitIT extends MlNativeAutodetectIntegTestCase { cleanUp(); } - @AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/pull/4033") public void testTooManyPartitions() throws Exception { Detector.Builder detector = new Detector.Builder("count", null); detector.setPartitionFieldName("user"); @@ -85,14 +84,13 @@ public class AutodetectMemoryLimitIT extends MlNativeAutodetectIntegTestCase { // it is important to check that while we rejected partitions, we still managed // to create some by fields; it shows we utilize memory in a meaningful way // rather than creating empty partitions - assertThat(modelSizeStats.getTotalPartitionFieldCount(), lessThan(1100L)); - assertThat(modelSizeStats.getTotalPartitionFieldCount(), greaterThan(850L)); - assertThat(modelSizeStats.getTotalByFieldCount(), lessThan(1000L)); - assertThat(modelSizeStats.getTotalByFieldCount(), greaterThan(750L)); + assertThat(modelSizeStats.getTotalPartitionFieldCount(), lessThan(900L)); + assertThat(modelSizeStats.getTotalPartitionFieldCount(), greaterThan(650L)); + assertThat(modelSizeStats.getTotalByFieldCount(), lessThan(900L)); + assertThat(modelSizeStats.getTotalByFieldCount(), greaterThan(650L)); assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT)); } - @AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/pull/4033") public void testTooManyByFields() throws Exception { Detector.Builder detector = new Detector.Builder("count", null); detector.setByFieldName("user"); @@ -135,8 +133,8 @@ public class AutodetectMemoryLimitIT extends MlNativeAutodetectIntegTestCase { ModelSizeStats modelSizeStats = jobStats.getModelSizeStats(); assertThat(modelSizeStats.getModelBytes(), lessThan(36000000L)); assertThat(modelSizeStats.getModelBytes(), greaterThan(30000000L)); - assertThat(modelSizeStats.getTotalByFieldCount(), lessThan(2300L)); - assertThat(modelSizeStats.getTotalByFieldCount(), greaterThan(2000L)); + assertThat(modelSizeStats.getTotalByFieldCount(), lessThan(1900L)); + assertThat(modelSizeStats.getTotalByFieldCount(), greaterThan(1600L)); assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT)); }