mtfelisb commented on code in PR #53: URL: https://github.com/apache/flink-connector-elasticsearch/pull/53#discussion_r1484848274
########## flink-connector-elasticsearch8/src/test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch8AsyncWriterITCase.java: ########## @@ -0,0 +1,276 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.flink.connector.elasticsearch.sink; + +import org.apache.flink.connector.base.sink.writer.TestSinkInitContext; +import org.apache.flink.connector.elasticsearch.sink.Elasticsearch8AsyncSinkITCase.DummyData; +import org.apache.flink.metrics.Gauge; + +import co.elastic.clients.elasticsearch.core.bulk.IndexOperation; +import co.elastic.clients.elasticsearch.core.bulk.UpdateOperation; +import org.apache.http.HttpHost; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.testcontainers.junit.jupiter.Testcontainers; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Consumer; + +import static org.assertj.core.api.Assertions.assertThat; + +/** Integration tests for {@link Elasticsearch8AsyncWriter}. */ +@Testcontainers +public class Elasticsearch8AsyncWriterITCase extends ElasticsearchSinkBaseITCase { + private TestSinkInitContext context; + + private final Lock lock = new ReentrantLock(); + + private final Condition completed = lock.newCondition(); + + @BeforeEach + void setUp() { + this.context = new TestSinkInitContext(); + this.client = getRestClient(); + } + + @AfterEach + void shutdown() throws IOException { + if (client != null) { + client.close(); + } + } + + @Test + @Timeout(5) + public void testBulkOnFlush() throws IOException, InterruptedException { + String index = "test-bulk-on-flush"; + int maxBatchSize = 2; + + try (final Elasticsearch8AsyncWriter<DummyData> writer = + createWriter(index, maxBatchSize)) { + writer.write(new DummyData("test-1", "test-1"), null); + writer.write(new DummyData("test-2", "test-2"), null); + + writer.flush(false); + assertIdsAreWritten(index, new String[] {"test-1", "test-2"}); + + writer.write(new DummyData("3", "test-3"), null); + + writer.flush(true); + assertIdsAreWritten(index, new String[] {"test-3"}); + } + } + + @Test + @Timeout(5) + public void testBulkOnBufferTimeFlush() throws Exception { + String index = "test-bulk-on-time-in-buffer"; + int maxBatchSize = 3; + + try (final Elasticsearch8AsyncWriter<DummyData> writer = + createWriter(index, maxBatchSize)) { + writer.write(new DummyData("test-1", "test-1"), null); + writer.flush(true); + + assertIdsAreWritten(index, new String[] {"test-1"}); + + writer.write(new DummyData("test-2", "test-2"), null); + writer.write(new DummyData("test-3", "test-3"), null); + + assertIdsAreNotWritten(index, new String[] {"test-2", "test-3"}); + context.getTestProcessingTimeService().advance(6000L); + + await(); + } + + assertIdsAreWritten(index, new String[] {"test-2", "test-3"}); + } + + @Test + @Timeout(5) + public void testBytesSentMetric() throws Exception { + String index = "test-bytes-sent-metrics"; + int maxBatchSize = 3; + + try (final Elasticsearch8AsyncWriter<DummyData> writer = + createWriter(index, maxBatchSize)) { + assertThat(context.getNumBytesOutCounter().getCount()).isEqualTo(0); + + writer.write(new DummyData("test-1", "test-1"), null); + writer.write(new DummyData("test-2", "test-2"), null); + writer.write(new DummyData("test-3", "test-3"), null); + + await(); + } + + assertThat(context.getNumBytesOutCounter().getCount()).isGreaterThan(0); + assertIdsAreWritten(index, new String[] {"test-1", "test-2", "test-3"}); + } + + @Test + @Timeout(5) + public void testRecordsSentMetric() throws Exception { + String index = "test-records-sent-metric"; + int maxBatchSize = 3; + + try (final Elasticsearch8AsyncWriter<DummyData> writer = + createWriter(index, maxBatchSize)) { + assertThat(context.getNumRecordsOutCounter().getCount()).isEqualTo(0); + + writer.write(new DummyData("test-1", "test-1"), null); + writer.write(new DummyData("test-2", "test-2"), null); + writer.write(new DummyData("test-3", "test-3"), null); + + await(); + } + + assertThat(context.getNumRecordsOutCounter().getCount()).isEqualTo(3); + assertIdsAreWritten(index, new String[] {"test-1", "test-2", "test-3"}); + } + + @Test + @Timeout(5) + public void testSendTimeMetric() throws Exception { + String index = "test-send-time-metric"; + int maxBatchSize = 3; + + try (final Elasticsearch8AsyncWriter<DummyData> writer = + createWriter(index, maxBatchSize)) { + final Optional<Gauge<Long>> currentSendTime = context.getCurrentSendTimeGauge(); + + writer.write(new DummyData("test-1", "test-1"), null); + writer.write(new DummyData("test-2", "test-2"), null); + writer.write(new DummyData("test-3", "test-3"), null); + + await(); + + assertThat(currentSendTime).isPresent(); + assertThat(currentSendTime.get().getValue()).isGreaterThan(0L); + } + + assertIdsAreWritten(index, new String[] {"test-1", "test-2", "test-3"}); + } + + @Test + @Timeout(5) + public void testHandlePartiallyFailedBulk() throws Exception { + String index = "test-partially-failed-bulk"; + int maxBatchSize = 2; + + Elasticsearch8AsyncSinkBuilder.OperationConverter<DummyData> elementConverter = + new Elasticsearch8AsyncSinkBuilder.OperationConverter<>( + (element, ctx) -> + new UpdateOperation.Builder<>() + .id(element.getId()) + .index(index) + .action( + ac -> + ac.doc(element) + .docAsUpsert( + element.getId() + .equals("test-2"))) + .build()); + + try (final Elasticsearch8AsyncWriter<DummyData> writer = + createWriter(index, maxBatchSize, elementConverter)) { + writer.write(new DummyData("test-1", "test-1-updated"), null); + writer.write(new DummyData("test-2", "test-2-updated"), null); + } + + await(); + + assertThat(context.metricGroup().getNumRecordsOutErrorsCounter().getCount()).isEqualTo(1); + assertIdsAreWritten(index, new String[] {"test-2"}); + assertIdsAreNotWritten(index, new String[] {"test-1"}); + } + + private Elasticsearch8AsyncSinkBuilder.OperationConverter<DummyData> + getDefaultTestElementConverter(String index) { + return new Elasticsearch8AsyncSinkBuilder.OperationConverter<>( + (element, ctx) -> + new IndexOperation.Builder<DummyData>() + .id(element.getId()) + .document(element) + .index(index) + .build()); + } + + private Elasticsearch8AsyncWriter<DummyData> createWriter(String index, int maxBatchSize) { + return createWriter(index, maxBatchSize, getDefaultTestElementConverter(index)); + } + + private Elasticsearch8AsyncWriter<DummyData> createWriter( + String index, + int maxBatchSize, + Elasticsearch8AsyncSinkBuilder.OperationConverter<DummyData> elementConverter) { + return new Elasticsearch8AsyncWriter<DummyData>( Review Comment: Hey, @Jiabao-Sun I've requested your review. I had to rebase the main here to get [these changes](https://github.com/apache/flink-connector-elasticsearch/commit/52f2afdda90d4d8881d64e6d13c8c8f8b94eb922). Essentially, I'm creating the writer via sink as you pointed out https://github.com/apache/flink-connector-elasticsearch/pull/53/commits/2869a87a4df3823010b963571a0aa1ea63fe0a0e. Once again, thank you! 👊 @MartijnVisser its indeed working for Flink 1.17/1.18 and the upcoming 1.19 (in a single branch approach) 🙌 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
