This is an automated email from the ASF dual-hosted git repository.
guoyangze pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 4e5a34d [FLINK-26281][connectors/elasticsearch] Remove unused
'connection.max-retry-timeout' option
4e5a34d is described below
commit 4e5a34d35e45154a85ad893cfbacf7d7202db411
Author: Alexander Preuß <11444089+alp...@users.noreply.github.com>
AuthorDate: Tue Mar 22 14:48:49 2022 +0100
[FLINK-26281][connectors/elasticsearch] Remove unused
'connection.max-retry-timeout' option
This closes #19202.
---
docs/content/docs/connectors/table/elasticsearch.md | 8 --------
.../elasticsearch/table/ElasticsearchConnectorOptions.java | 6 ------
.../elasticsearch/table/Elasticsearch6DynamicSinkFactory.java | 2 --
.../elasticsearch/table/Elasticsearch7DynamicSinkFactory.java | 2 --
4 files changed, 18 deletions(-)
diff --git a/docs/content/docs/connectors/table/elasticsearch.md
b/docs/content/docs/connectors/table/elasticsearch.md
index 2042e61..47109cc 100644
--- a/docs/content/docs/connectors/table/elasticsearch.md
+++ b/docs/content/docs/connectors/table/elasticsearch.md
@@ -226,14 +226,6 @@ Connector Options
<td>Delay between each backoff attempt. For <code>CONSTANT</code>
backoff, this is simply the delay between each retry. For
<code>EXPONENTIAL</code> backoff, this is the initial base delay.</td>
</tr>
<tr>
- <td><h5>connection.max-retry-timeout</h5></td>
- <td>optional</td>
- <td>no</td>
- <td style="word-wrap: break-word;">(none)</td>
- <td>Duration</td>
- <td>Maximum timeout between retries.</td>
- </tr>
- <tr>
<td><h5>connection.path-prefix</h5></td>
<td>optional</td>
<td>yes</td>
diff --git
a/flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/ElasticsearchConnectorOptions.java
b/flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/ElasticsearchConnectorOptions.java
index 1b0fc5e..38d65a7 100644
---
a/flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/ElasticsearchConnectorOptions.java
+++
b/flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/ElasticsearchConnectorOptions.java
@@ -133,12 +133,6 @@ public class ElasticsearchConnectorOptions {
.noDefaultValue()
.withDescription("Delay between each backoff attempt.");
- public static final ConfigOption<Duration>
CONNECTION_MAX_RETRY_TIMEOUT_OPTION =
- ConfigOptions.key("connection.max-retry-timeout")
- .durationType()
- .noDefaultValue()
- .withDescription("Maximum timeout between retries.");
-
public static final ConfigOption<String> CONNECTION_PATH_PREFIX =
ConfigOptions.key("connection.path-prefix")
.stringType()
diff --git
a/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java
b/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java
index ff600a7..73f5cf8 100644
---
a/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java
+++
b/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java
@@ -47,7 +47,6 @@ import static
org.apache.flink.streaming.connectors.elasticsearch.table.Elastics
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.BULK_FLUSH_BACKOFF_TYPE_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.BULK_FLUSH_INTERVAL_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.BULK_FLUSH_MAX_ACTIONS_OPTION;
-import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.CONNECTION_MAX_RETRY_TIMEOUT_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.CONNECTION_PATH_PREFIX;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.DOCUMENT_TYPE_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.FAILURE_HANDLER_OPTION;
@@ -75,7 +74,6 @@ public class Elasticsearch6DynamicSinkFactory implements
DynamicTableSinkFactory
BULK_FLUSH_BACKOFF_TYPE_OPTION,
BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION,
BULK_FLUSH_BACKOFF_DELAY_OPTION,
- CONNECTION_MAX_RETRY_TIMEOUT_OPTION,
CONNECTION_PATH_PREFIX,
FORMAT_OPTION,
PASSWORD_OPTION,
diff --git
a/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java
b/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java
index 50c37f0..70b0134 100644
---
a/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java
+++
b/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java
@@ -47,7 +47,6 @@ import static
org.apache.flink.streaming.connectors.elasticsearch.table.Elastics
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.BULK_FLUSH_BACKOFF_TYPE_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.BULK_FLUSH_INTERVAL_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.BULK_FLUSH_MAX_ACTIONS_OPTION;
-import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.CONNECTION_MAX_RETRY_TIMEOUT_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.CONNECTION_PATH_PREFIX;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.FAILURE_HANDLER_OPTION;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchConnectorOptions.FLUSH_ON_CHECKPOINT_OPTION;
@@ -74,7 +73,6 @@ public class Elasticsearch7DynamicSinkFactory implements
DynamicTableSinkFactory
BULK_FLUSH_BACKOFF_TYPE_OPTION,
BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION,
BULK_FLUSH_BACKOFF_DELAY_OPTION,
- CONNECTION_MAX_RETRY_TIMEOUT_OPTION,
CONNECTION_PATH_PREFIX,
FORMAT_OPTION,
PASSWORD_OPTION,
