Skip to content

[improve][test][branch-2.10] Backport disabling disk usage threshold for Elastic Testcontainers #20676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhotari merged 1 commit into from
Jun 28, 2023
Merged

[improve][test][branch-2.10] Backport disabling disk usage threshold for Elastic Testcontainers #20676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...lastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,22 @@
*/
package org.apache.pulsar.io.elasticsearch;

import org.testcontainers.elasticsearch.ElasticsearchContainer;

import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.testcontainers.elasticsearch.ElasticsearchContainer;

@Slf4j
public class ElasticSearchTestBase {

private static final String ELASTICSEARCH_IMAGE = Optional.ofNullable(System.getenv("ELASTICSEARCH_IMAGE"))
.orElse("docker.elastic.co/elasticsearch/elasticsearch:7.16.3-amd64");

protected static ElasticsearchContainer createElasticsearchContainer() {
return new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
.withEnv("ES_JAVA_OPTS", "-Xms128m -Xmx256m");
.withEnv("ES_JAVA_OPTS", "-Xms128m -Xmx256m")
.withEnv("ingest.geoip.downloader.enabled", "false")
.withLogConsumer(o -> log.info("elastic> {}", o.getUtf8String()));


}

Expand Down
15 changes: 12 additions & 3 deletions ...n/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearchSinkTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
package org.apache.pulsar.tests.integration.io.sinks;

import static org.testng.Assert.assertTrue;

import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

import lombok.AllArgsConstructor;
import lombok.Cleanup;
import lombok.Data;
Expand Down Expand Up @@ -93,7 +91,18 @@ public ElasticSearchSinkTester(boolean schemaEnable) {

@Override
protected ElasticSearchContainer createSinkService(PulsarCluster cluster) {
return new ElasticSearchContainer(cluster.getClusterName());
ElasticSearchContainer elasticsearchContainer = new ElasticSearchContainer(cluster.getClusterName());
configureElasticContainer(elasticsearchContainer);
return elasticsearchContainer;
}

protected void configureElasticContainer(ElasticSearchContainer elasticContainer) {
elasticContainer.withEnv("ingest.geoip.downloader.enabled", "false");

// allow disk to fill up beyond default 90% threshold
elasticContainer.withEnv("cluster.routing.allocation.disk.threshold_enabled", "false");

elasticContainer.withLogConsumer(o -> log.info("elastic> {}", o.getUtf8String()));
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions ...tegration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s
.withEnv("journalSyncData", "false")
.withEnv("journalMaxGroupWaitMSec", "0")
.withEnv("clusterName", clusterName)
.withEnv("PULSAR_PREFIX_diskUsageWarnThreshold", "0.95")
.withEnv("diskUsageThreshold", "0.99")
.withEnv("PULSAR_PREFIX_diskUsageLwmThreshold", "0.97")
.withEnv("nettyMaxFrameSizeBytes", "" + spec.maxMessageSize)
)
);
Expand Down