zentol closed pull request #7387: [FLINK-11235] fix thread lack when
elasticsearch transport client init failed
URL: https://github.com/apache/flink/pull/7387
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/flink-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/Elasticsearch2ApiCallBridge.java
b/flink-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/Elasticsearch2ApiCallBridge.java
index 73a69ebde34..34f2ad3a49e 100644
---
a/flink-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/Elasticsearch2ApiCallBridge.java
+++
b/flink-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/Elasticsearch2ApiCallBridge.java
@@ -21,6 +21,7 @@
import
org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchApiCallBridge;
import
org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkBase;
import
org.apache.flink.streaming.connectors.elasticsearch.util.ElasticsearchUtils;
+import org.apache.flink.util.IOUtils;
import org.apache.flink.util.Preconditions;
import org.elasticsearch.action.bulk.BackoffPolicy;
@@ -72,6 +73,10 @@ public TransportClient createClient(Map<String, String>
clientConfig) {
// verify that we actually are connected to a cluster
if (transportClient.connectedNodes().isEmpty()) {
+
+ // close the transportClient here
+ IOUtils.closeQuietly(transportClient);
+
throw new RuntimeException("Elasticsearch client is not
connected to any Elasticsearch nodes!");
}
diff --git
a/flink-connectors/flink-connector-elasticsearch5/src/main/java/org/apache/flink/streaming/connectors/elasticsearch5/Elasticsearch5ApiCallBridge.java
b/flink-connectors/flink-connector-elasticsearch5/src/main/java/org/apache/flink/streaming/connectors/elasticsearch5/Elasticsearch5ApiCallBridge.java
index a3453ec4445..d59b8e9f912 100644
---
a/flink-connectors/flink-connector-elasticsearch5/src/main/java/org/apache/flink/streaming/connectors/elasticsearch5/Elasticsearch5ApiCallBridge.java
+++
b/flink-connectors/flink-connector-elasticsearch5/src/main/java/org/apache/flink/streaming/connectors/elasticsearch5/Elasticsearch5ApiCallBridge.java
@@ -21,6 +21,7 @@
import
org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchApiCallBridge;
import
org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkBase;
import
org.apache.flink.streaming.connectors.elasticsearch.util.ElasticsearchUtils;
+import org.apache.flink.util.IOUtils;
import org.apache.flink.util.Preconditions;
import org.elasticsearch.action.bulk.BackoffPolicy;
@@ -78,6 +79,10 @@ public TransportClient createClient(Map<String, String>
clientConfig) {
// verify that we actually are connected to a cluster
if (transportClient.connectedNodes().isEmpty()) {
+
+ // close the transportClient here
+ IOUtils.closeQuietly(transportClient);
+
throw new RuntimeException("Elasticsearch client is not
connected to any Elasticsearch nodes!");
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
