[Feature][Connector-V2][Elasticsearch] Elasticsearch supports spaced write and is relatively real-time data source friendly #4347 #4349
+86
−5
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,11 @@ | |
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.Executors; | ||
| import java.util.concurrent.ScheduledExecutorService; | ||
| import java.util.concurrent.ScheduledFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| /** | ||
| * ElasticsearchSinkWriter is a sink writer that will write {@link SeaTunnelRow} to Elasticsearch. | ||
|
|
@@ -54,20 +59,28 @@ public class ElasticsearchSinkWriter | |
|
|
||
| private final int maxBatchSize; | ||
|
|
||
| private final int batchIntervalMs; | ||
|
|
||
| private final SeaTunnelRowSerializer seaTunnelRowSerializer; | ||
| private final List<String> requestEsList; | ||
| private EsRestClient esRestClient; | ||
| private RetryMaterial retryMaterial; | ||
| private static final long DEFAULT_SLEEP_TIME_MS = 200L; | ||
|
|
||
| private transient ScheduledExecutorService scheduler; | ||
| private transient ScheduledFuture<?> scheduledFuture; | ||
| private transient boolean isClose; | ||
|
|
||
| public ElasticsearchSinkWriter( | ||
| SinkWriter.Context context, | ||
| SeaTunnelRowType seaTunnelRowType, | ||
| Config pluginConfig, | ||
| int maxBatchSize, | ||
| int maxRetryCount, | ||
| int batchIntervalMs) { | ||
| this.context = context; | ||
| this.maxBatchSize = maxBatchSize; | ||
| this.batchIntervalMs = batchIntervalMs; | ||
|
|
||
| IndexInfo indexInfo = new IndexInfo(pluginConfig); | ||
| esRestClient = EsRestClient.createInstance(pluginConfig); | ||
|
|
@@ -78,6 +91,11 @@ public ElasticsearchSinkWriter( | |
| this.requestEsList = new ArrayList<>(maxBatchSize); | ||
| this.retryMaterial = | ||
| new RetryMaterial(maxRetryCount, true, exception -> true, DEFAULT_SLEEP_TIME_MS); | ||
| // Initialize the interval flush | ||
| if (this.batchIntervalMs > 0) { | ||
| startScheduler(); | ||
| log.info("The initial scheduling is complete batch_interval_ms :" + batchIntervalMs); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -93,6 +111,32 @@ public void write(SeaTunnelRow element) { | |
| } | ||
| } | ||
|
|
||
| public void startScheduler() { | ||
| this.scheduler = | ||
| Executors.newScheduledThreadPool( | ||
| 1, | ||
| runnable -> { | ||
| AtomicInteger cnt = new AtomicInteger(0); | ||
| Thread thread = new Thread(runnable); | ||
| thread.setDaemon(true); | ||
| thread.setName( | ||
| "sink-elasticsearch-interval" + "-" + cnt.incrementAndGet()); | ||
| return thread; | ||
| }); | ||
| this.scheduledFuture = | ||
| this.scheduler.scheduleWithFixedDelay( | ||
| () -> { | ||
| synchronized (ElasticsearchSinkWriter.this) { | ||
| if (requestEsList.size() > 0 && !isClose) { | ||
| bulkEsWithRetry(this.esRestClient, this.requestEsList); | ||
| } | ||
| } | ||
| }, | ||
| this.batchIntervalMs, | ||
| this.batchIntervalMs, | ||
| TimeUnit.MILLISECONDS); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<ElasticsearchCommitInfo> prepareCommit() { | ||
| bulkEsWithRetry(this.esRestClient, this.requestEsList); | ||
|
|
@@ -115,6 +159,9 @@ public synchronized void bulkEsWithRetry( | |
| ElasticsearchConnectorErrorCode.BULK_RESPONSE_ERROR, | ||
| "bulk es error: " + bulkResponse.getResponse()); | ||
| } | ||
| log.info( | ||
|
There was a problem hiding this comment. I support not to introduce ScheduledThreadPool,but run Thead.sleep(batchIntervalMs) after bulk request. There was a problem hiding this comment. I think it's going to be a little bit more write friendly for real-time programs and even if the consumption data is less than the current batch it's going to flush to es There was a problem hiding this comment. Seem like don't a better way to flush data without |
||
| "bulk es successfully written to the rowNum: " | ||
| + requestEsList.size()); | ||
| return bulkResponse; | ||
| } | ||
| return null; | ||
|
|
@@ -132,6 +179,12 @@ public synchronized void bulkEsWithRetry( | |
| @Override | ||
| public void close() throws IOException { | ||
| bulkEsWithRetry(this.esRestClient, this.requestEsList); | ||
| this.isClose = true; | ||
| if (esRestClient != null) { | ||
| esRestClient.close(); | ||
| } | ||
| if (this.scheduler != null) { | ||
| this.scheduler.shutdown(); | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need a default
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.