From 7cc032968fcd0d1e98b344c4ea0436c9f63af774 Mon Sep 17 00:00:00 2001 From: Dan Hermann Date: Thu, 22 Apr 2021 14:46:45 -0500 Subject: [PATCH] [7.x] Re-enable tests that were failing due to JDK memory bug on Debian8 (#72125) --- .../elasticsearch/test/ESIntegTestCase.java | 20 ------------------- ...ansportGetAutoscalingCapacityActionIT.java | 3 --- .../integration/BasicDistributedJobsIT.java | 4 ---- .../integration/MlDistributedFailureIT.java | 4 ---- .../xpack/ml/integration/TooManyJobsIT.java | 4 ---- 5 files changed, 35 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 1499ad1075eba..9f39e94df7903 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -47,7 +47,6 @@ import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.client.AdminClient; import org.elasticsearch.client.Client; import org.elasticsearch.client.ClusterAdminClient; @@ -124,7 +123,6 @@ import org.elasticsearch.indices.IndicesRequestCache; import org.elasticsearch.indices.store.IndicesStore; import org.elasticsearch.ingest.IngestMetadata; -import org.elasticsearch.monitor.os.OsInfo; import org.elasticsearch.node.NodeMocksPlugin; import org.elasticsearch.plugins.NetworkPlugin; import org.elasticsearch.plugins.Plugin; @@ -2430,22 +2428,4 @@ public Settings onNodeStopped(String nodeName) throws Exception { } }); } - - /** - * On Debian 8 the "memory" subsystem is not mounted by default - * when cgroups are enabled, and this confuses many versions of - * Java prior to Java 15. Tests that rely on machine memory - * being accurately determined will not work on such setups, - * and can use this method for selective muting. - * See https://github.com/elastic/elasticsearch/issues/67089 - * and https://github.com/elastic/elasticsearch/issues/66885 - */ - protected boolean willSufferDebian8MemoryProblem() { - final NodesInfoResponse response = client().admin().cluster().prepareNodesInfo().execute().actionGet(); - final boolean anyDebian8Nodes = response.getNodes() - .stream() - .anyMatch(ni -> ni.getInfo(OsInfo.class).getPrettyName().equals("Debian GNU/Linux 8 (jessie)")); - boolean java15Plus = JavaVersion.current().compareTo(JavaVersion.parse("15")) >= 0; - return anyDebian8Nodes && java15Plus == false; - } } diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityActionIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityActionIT.java index 9526c68a3e06a..a806457c8db52 100644 --- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityActionIT.java +++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityActionIT.java @@ -34,9 +34,6 @@ public class TransportGetAutoscalingCapacityActionIT extends AutoscalingIntegTestCase { public void testCurrentCapacity() throws Exception { - // see: https://github.com/elastic/elasticsearch/issues/67089#issuecomment-756114654 - assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem()); - assertThat(capacity().results().keySet(), Matchers.empty()); long memory = OsProbe.getInstance().getTotalPhysicalMemorySize(); long storage = internalCluster().getInstance(NodeEnvironment.class).nodePaths()[0].fileStore.getTotalSpace(); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java index c3a03a057287c..fcb08ff3e9726 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java @@ -452,10 +452,6 @@ public void testMlStateAndResultsIndicesNotAvailable() throws Exception { } public void testCloseUnassignedLazyJobAndDatafeed() throws Exception { - - // see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179 - assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem()); - internalCluster().ensureAtLeastNumDataNodes(3); ensureStableCluster(3); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java index 7f8a117919e19..9efc56c54bce6 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java @@ -410,10 +410,6 @@ public void testStopAndForceStopDatafeed() throws Exception { } public void testJobRelocationIsMemoryAware() throws Exception { - - // see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179 - assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem()); - internalCluster().ensureAtLeastNumDataNodes(1); ensureStableCluster(); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java index 69c7f57def6c1..e9b63b200360d 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java @@ -127,14 +127,10 @@ public void testLazyNodeValidation() throws Exception { } public void testSingleNode() throws Exception { - // see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179 - assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem()); verifyMaxNumberOfJobsLimit(1, randomIntBetween(1, 20), randomBoolean()); } public void testMultipleNodes() throws Exception { - // see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179 - assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem()); verifyMaxNumberOfJobsLimit(3, randomIntBetween(1, 20), randomBoolean()); }