You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/01/30 14:55:47 UTC
[4/5] flink git commit: [FLINK-8476][config][HA] Deprecate HA config
constants
[FLINK-8476][config][HA] Deprecate HA config constants
This closes #5338.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/83eb8e14
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/83eb8e14
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/83eb8e14
Branch: refs/heads/master
Commit: 83eb8e143ef64e56974a334ca96e10c011f4a32c
Parents: 2e63d5a
Author: zentol <ch...@apache.org>
Authored: Tue Jan 23 12:32:06 2018 +0100
Committer: zentol <ch...@apache.org>
Committed: Tue Jan 30 15:54:16 2018 +0100
----------------------------------------------------------------------
.../org/apache/flink/configuration/ConfigConstants.java | 11 +++++++++--
.../flink/runtime/jobmanager/HighAvailabilityMode.java | 2 +-
.../apache/flink/runtime/util/LeaderRetrievalUtils.java | 5 ++---
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/83eb8e14/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index 7b76f53..76a2c41 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -989,16 +989,18 @@ public final class ConfigConstants {
// --------------------------- High Availability --------------------------
- /** Defines high availability mode used for the cluster execution ("NONE", "ZOOKEEPER"). */
+ /** @deprecated Deprecated in favour of {@link HighAvailabilityOptions#HA_MODE} */
@PublicEvolving
+ @Deprecated
public static final String HA_MODE = "high-availability";
/** Ports used by the job manager if not in 'none' recovery mode. */
@PublicEvolving
public static final String HA_JOB_MANAGER_PORT = "high-availability.jobmanager.port";
- /** The time before the JobManager recovers persisted jobs. */
+ /** @deprecated Deprecated in favour of {@link HighAvailabilityOptions#HA_JOB_DELAY}. */
@PublicEvolving
+ @Deprecated
public static final String HA_JOB_DELAY = "high-availability.job.delay";
/** @deprecated Deprecated in favour of {@link #HA_MODE}. */
@@ -1776,7 +1778,9 @@ public final class ConfigConstants {
// --------------------------- High Availability ---------------------------------
+ /** @deprecated Deprecated in favour of {@link HighAvailabilityOptions#HA_MODE} */
@PublicEvolving
+ @Deprecated
public static final String DEFAULT_HA_MODE = "none";
/** @deprecated Deprecated in favour of {@link #DEFAULT_HA_MODE} */
@@ -1786,8 +1790,11 @@ public final class ConfigConstants {
/**
* Default port used by the job manager if not in standalone recovery mode. If <code>0</code>
* the OS picks a random port port.
+ *
+ * @deprecated No longer used.
*/
@PublicEvolving
+ @Deprecated
public static final String DEFAULT_HA_JOB_MANAGER_PORT = "0";
/** @deprecated Deprecated in favour of {@link #DEFAULT_HA_JOB_MANAGER_PORT} */
http://git-wip-us.apache.org/repos/asf/flink/blob/83eb8e14/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/HighAvailabilityMode.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/HighAvailabilityMode.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/HighAvailabilityMode.java
index fa2db48..7dc13c2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/HighAvailabilityMode.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/HighAvailabilityMode.java
@@ -39,7 +39,7 @@ public enum HighAvailabilityMode {
* Return the configured {@link HighAvailabilityMode}.
*
* @param config The config to parse
- * @return Configured recovery mode or {@link ConfigConstants#DEFAULT_HA_MODE} if not
+ * @return Configured recovery mode or {@link HighAvailabilityMode#NONE} if not
* configured.
*/
public static HighAvailabilityMode fromConfig(Configuration config) {
http://git-wip-us.apache.org/repos/asf/flink/blob/83eb8e14/flink-runtime/src/main/java/org/apache/flink/runtime/util/LeaderRetrievalUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/LeaderRetrievalUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/LeaderRetrievalUtils.java
index aeaa2b9..4d78335 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/LeaderRetrievalUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/LeaderRetrievalUtils.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.util;
import org.apache.flink.api.common.time.Time;
-import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.HighAvailabilityOptions;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.instance.ActorGateway;
@@ -264,8 +264,7 @@ public class LeaderRetrievalUtils {
}
/**
- * Gets the recovery mode as configured, based on the {@link ConfigConstants#HA_MODE}
- * config key.
+ * Gets the recovery mode as configured, based on {@link HighAvailabilityOptions#HA_MODE}.
*
* @param config The configuration to read the recovery mode from.
* @return The recovery mode.