Github user rmetzger commented on a diff in the pull request:
https://github.com/apache/flink/pull/3358#discussion_r102544239
--- Diff:
flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/ElasticsearchSinkBase.java
---
@@ -92,40 +152,59 @@
/** Call bridge for different version-specfic */
private final ElasticsearchApiCallBridge callBridge;
+ /**
+ * Number of pending action requests not yet acknowledged by
Elasticsearch.
+ * This value is maintained only if {@link
ElasticsearchSinkBase#flushOnCheckpoint} is {@code true}.
+ *
+ * This is incremented whenever the user adds (or re-adds through the
{@link ActionRequestFailureHandler}) requests
+ * to the {@link RequestIndexer}. It is decremented for each completed
request of a bulk request, in
+ * {@link BulkProcessor.Listener#afterBulk(long, BulkRequest,
BulkResponse)} and
+ * {@link BulkProcessor.Listener#afterBulk(long, BulkRequest,
Throwable)}.
+ */
+ private AtomicLong numPendingRequests = new AtomicLong(0);
+
/** Elasticsearch client created using the call bridge. */
private transient Client client;
/** Bulk processor to buffer and send requests to Elasticsearch,
created using the client. */
private transient BulkProcessor bulkProcessor;
/**
- * This is set from inside the {@link BulkProcessor.Listener} if a
{@link Throwable} was thrown in callbacks.
+ * This is set from inside the {@link BulkProcessor.Listener} if a
{@link Throwable} was thrown in callbacks and
+ * the user considered it should fail the sink via the
+ * {@link ActionRequestFailureHandler#onFailure(ActionRequest,
Throwable, int, RequestIndexer)} method.
+ *
+ * Errors will be checked and rethrown before processing each input
element, and when the sink is closed.
*/
private final AtomicReference<Throwable> failureThrowable = new
AtomicReference<>();
public ElasticsearchSinkBase(
ElasticsearchApiCallBridge callBridge,
Map<String, String> userConfig,
- ElasticsearchSinkFunction<T> elasticsearchSinkFunction) {
+ ElasticsearchSinkFunction<T> elasticsearchSinkFunction,
+ ActionRequestFailureHandler failureHandler) {
this.callBridge = checkNotNull(callBridge);
this.elasticsearchSinkFunction =
checkNotNull(elasticsearchSinkFunction);
+ this.failureHandler = checkNotNull(failureHandler);
- // we eagerly check if the user-provided sink function is
serializable;
- // otherwise, if it isn't serializable, users will merely get a
non-informative error message
+ // we eagerly check if the user-provided sink function and
failure handler is serializable;
+ // otherwise, if they aren't serializable, users will merely
get a non-informative error message
// "ElasticsearchSinkBase is not serializable"
- try {
-
InstantiationUtil.serializeObject(elasticsearchSinkFunction);
- } catch (Exception e) {
- throw new IllegalArgumentException(
- "The implementation of the provided
ElasticsearchSinkFunction is not serializable. " +
- "The object probably contains or references non
serializable fields.");
- }
- checkNotNull(userConfig);
+
checkArgument(InstantiationUtil.isSerializable(elasticsearchSinkFunction),
+ "The implementation of the provided
ElasticsearchSinkFunction is not serializable. " +
+ "The object probably contains or references
non-serializable fields.");
+
+ checkArgument(InstantiationUtil.isSerializable(failureHandler),
+ "The implementation of the provided
ActionRequestFailureHandler is not serializable. " +
+ "The object probably contains or references
non-serializable fields.");
--- End diff --
That's so much nicer now :)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
