Skip to content

Commit 6421dca

Browse files
authored
Re-enable tests that were failing due to JDK memory bug on Debian8 (#68663) (#72126)
1 parent 931f18b commit 6421dca

File tree

5 files changed

+0
-35
lines changed

5 files changed

+0
-35
lines changed

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
4848
import org.elasticsearch.action.support.DestructiveOperations;
4949
import org.elasticsearch.action.support.IndicesOptions;
50-
import org.elasticsearch.bootstrap.JavaVersion;
5150
import org.elasticsearch.client.AdminClient;
5251
import org.elasticsearch.client.Client;
5352
import org.elasticsearch.client.ClusterAdminClient;
@@ -124,7 +123,6 @@
124123
import org.elasticsearch.indices.IndicesRequestCache;
125124
import org.elasticsearch.indices.store.IndicesStore;
126125
import org.elasticsearch.ingest.IngestMetadata;
127-
import org.elasticsearch.monitor.os.OsInfo;
128126
import org.elasticsearch.node.NodeMocksPlugin;
129127
import org.elasticsearch.plugins.NetworkPlugin;
130128
import org.elasticsearch.plugins.Plugin;
@@ -2430,22 +2428,4 @@ public Settings onNodeStopped(String nodeName) throws Exception {
24302428
}
24312429
});
24322430
}
2433-
2434-
/**
2435-
* On Debian 8 the "memory" subsystem is not mounted by default
2436-
* when cgroups are enabled, and this confuses many versions of
2437-
* Java prior to Java 15. Tests that rely on machine memory
2438-
* being accurately determined will not work on such setups,
2439-
* and can use this method for selective muting.
2440-
* See https://github.com/elastic/elasticsearch/issues/67089
2441-
* and https://github.com/elastic/elasticsearch/issues/66885
2442-
*/
2443-
protected boolean willSufferDebian8MemoryProblem() {
2444-
final NodesInfoResponse response = client().admin().cluster().prepareNodesInfo().execute().actionGet();
2445-
final boolean anyDebian8Nodes = response.getNodes()
2446-
.stream()
2447-
.anyMatch(ni -> ni.getInfo(OsInfo.class).getPrettyName().equals("Debian GNU/Linux 8 (jessie)"));
2448-
boolean java15Plus = JavaVersion.current().compareTo(JavaVersion.parse("15")) >= 0;
2449-
return anyDebian8Nodes && java15Plus == false;
2450-
}
24512431
}

x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityActionIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
public class TransportGetAutoscalingCapacityActionIT extends AutoscalingIntegTestCase {
3535

3636
public void testCurrentCapacity() throws Exception {
37-
// see: https://github.com/elastic/elasticsearch/issues/67089#issuecomment-756114654
38-
assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem());
39-
4037
assertThat(capacity().results().keySet(), Matchers.empty());
4138
long memory = OsProbe.getInstance().getTotalPhysicalMemorySize();
4239
long storage = internalCluster().getInstance(NodeEnvironment.class).nodePaths()[0].fileStore.getTotalSpace();

x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,6 @@ public void testMlStateAndResultsIndicesNotAvailable() throws Exception {
452452
}
453453

454454
public void testCloseUnassignedLazyJobAndDatafeed() throws Exception {
455-
456-
// see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179
457-
assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem());
458-
459455
internalCluster().ensureAtLeastNumDataNodes(3);
460456
ensureStableCluster(3);
461457

x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,6 @@ public void testStopAndForceStopDatafeed() throws Exception {
410410
}
411411

412412
public void testJobRelocationIsMemoryAware() throws Exception {
413-
414-
// see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179
415-
assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem());
416-
417413
internalCluster().ensureAtLeastNumDataNodes(1);
418414
ensureStableCluster();
419415

x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,10 @@ public void testLazyNodeValidation() throws Exception {
127127
}
128128

129129
public void testSingleNode() throws Exception {
130-
// see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179
131-
assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem());
132130
verifyMaxNumberOfJobsLimit(1, randomIntBetween(1, 20), randomBoolean());
133131
}
134132

135133
public void testMultipleNodes() throws Exception {
136-
// see: https://github.com/elastic/elasticsearch/issues/66885#issuecomment-758790179
137-
assumeFalse("cannot run on debian 8 prior to java 15", willSufferDebian8MemoryProblem());
138134
verifyMaxNumberOfJobsLimit(3, randomIntBetween(1, 20), randomBoolean());
139135
}
140136

0 commit comments

Comments
 (0)