Skip to content

re-enabling integration tests for Sinks #12307

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 8 commits into from
Oct 14, 2021
Merged

re-enabling integration tests for Sinks #12307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d47a783
re-enabling integration tests for Sinks
dlg99 Oct 8, 2021
23a2606
close elasticClient
dlg99 Oct 12, 2021
d2b10a2
Upgrade Elastic container
dlg99 Oct 12, 2021
e39ffdd
Split into two jobs, plus system prune
dlg99 Oct 12, 2021
26862c3
disabling tests for elastic
dlg99 Oct 13, 2021
2a4c73f
Revert "disabling tests for elastic"
dlg99 Oct 13, 2021
58cc03e
reduce memory for elastic
dlg99 Oct 13, 2021
3a525e6
Revert "Split into two jobs, plus system prune"
dlg99 Oct 13, 2021
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
2 changes: 1 addition & 1 deletion build/run_integration_group.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ test_group_sql() {

test_group_pulsar_io() {
mvn_run_integration_test --no-retry "$@" -DintegrationTestSuiteFile=pulsar-io-sources.xml -DintegrationTests -Dgroups=source
#mvn_run_integration_test --no-retry "$@" -DintegrationTestSuiteFile=pulsar-io-sinks.xml -DintegrationTests -Dgroups=sink
mvn_run_integration_test --no-retry "$@" -DintegrationTestSuiteFile=pulsar-io-sinks.xml -DintegrationTests -Dgroups=sink
}

test_group_pulsar_io_ora() {
Expand Down
3 changes: 2 additions & 1 deletion .../src/test/java/org/apache/pulsar/tests/integration/containers/ElasticSearchContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class ElasticSearchContainer extends ChaosContainer<ElasticSearchContaine
static final Integer[] PORTS = { 9200, 9300 };

public static final String IMAGE_NAME = Optional.ofNullable(System.getenv("ELASTICSEARCH_IMAGE"))
.orElse("docker.elastic.co/elasticsearch/elasticsearch:7.13.3");
.orElse("docker.elastic.co/elasticsearch/elasticsearch:7.15.0");

public ElasticSearchContainer(String clusterName) {
super(clusterName, IMAGE_NAME);
Expand All @@ -40,6 +40,7 @@ protected void configure() {
this.withNetworkAliases(NAME)
.withExposedPorts(PORTS)
.withEnv("discovery.type", "single-node")
.withEnv("ES_JAVA_OPTS", "-Xms2g -Xmx2g")
.withCreateContainerCmdModifier(createContainerCmd -> {
createContainerCmd.withHostName(NAME);
createContainerCmd.withName(clusterName + "-" + NAME);
Expand Down
16 changes: 16 additions & 0 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 @@ -21,13 +21,15 @@
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;

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;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpHost;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
Expand All @@ -45,6 +47,7 @@
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;

@Slf4j
public class ElasticSearchSinkTester extends SinkTester<ElasticSearchContainer> {

private RestHighLevelClient elasticClient;
Expand Down Expand Up @@ -104,6 +107,19 @@ public void prepareSink() throws Exception {
elasticClient = new RestHighLevelClient(builder);
}

@Override
public void stopServiceContainer(PulsarCluster cluster) {
try {
if (elasticClient != null) {
elasticClient.close();
}
} catch (IOException e) {
log.warn("Error closing elasticClient, ignoring", e);
} finally {
super.stopServiceContainer(cluster);
}
}

@Override
public void validateSinkResult(Map<String, String> kvs) {
SearchRequest searchRequest = new SearchRequest("test-index");
Expand Down