You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/12/29 17:03:16 UTC
flink git commit: [hotfix] Replace
HighAvailabilityOptions#HA_ZOOKEEPER_NAMESPACE with HA_CLUSTER_ID
Repository: flink
Updated Branches:
refs/heads/master c4acbb838 -> b5db8d908
[hotfix] Replace HighAvailabilityOptions#HA_ZOOKEEPER_NAMESPACE with HA_CLUSTER_ID
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b5db8d90
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b5db8d90
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b5db8d90
Branch: refs/heads/master
Commit: b5db8d90818efb96ac407ccc213f2892f3852321
Parents: c4acbb8
Author: Till Rohrmann <tr...@apache.org>
Authored: Fri Dec 29 16:06:59 2017 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Dec 29 16:06:59 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/flink/configuration/ConfigConstants.java | 4 ++--
.../apache/flink/configuration/HighAvailabilityOptions.java | 5 -----
.../java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java | 6 +++---
3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b5db8d90/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 5fd7085..50039ac 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
@@ -1031,7 +1031,7 @@ public final class ConfigConstants {
@Deprecated
public static final String HA_ZOOKEEPER_DIR_KEY = "high-availability.zookeeper.path.root";
- /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_NAMESPACE}. */
+ /** @deprecated in favor of {@link HighAvailabilityOptions#HA_CLUSTER_ID}. */
@PublicEvolving
@Deprecated
public static final String HA_ZOOKEEPER_NAMESPACE_KEY = "high-availability.zookeeper.path.namespace";
@@ -1788,7 +1788,7 @@ public final class ConfigConstants {
@Deprecated
public static final String DEFAULT_ZOOKEEPER_DIR_KEY = "/flink";
- /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_NAMESPACE}. */
+ /** @deprecated in favor of {@link HighAvailabilityOptions#HA_CLUSTER_ID}. */
@Deprecated
public static final String DEFAULT_ZOOKEEPER_NAMESPACE_KEY = "/default";
http://git-wip-us.apache.org/repos/asf/flink/blob/b5db8d90/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
index 2b026b9..6ee9f94 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
@@ -100,11 +100,6 @@ public class HighAvailabilityOptions {
.defaultValue("/flink")
.withDeprecatedKeys("recovery.zookeeper.path.root");
- public static final ConfigOption<String> HA_ZOOKEEPER_NAMESPACE =
- key("high-availability.zookeeper.path.namespace")
- .noDefaultValue()
- .withDeprecatedKeys("recovery.zookeeper.path.namespace");
-
public static final ConfigOption<String> HA_ZOOKEEPER_LATCH_PATH =
key("high-availability.zookeeper.path.latch")
.defaultValue("/leaderlatch")
http://git-wip-us.apache.org/repos/asf/flink/blob/b5db8d90/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
index c903a76..df4ef1f 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
@@ -73,7 +73,7 @@ import java.util.Properties;
import java.util.concurrent.Callable;
import static org.apache.flink.client.cli.CliFrontendParser.ADDRESS_OPTION;
-import static org.apache.flink.configuration.HighAvailabilityOptions.HA_ZOOKEEPER_NAMESPACE;
+import static org.apache.flink.configuration.HighAvailabilityOptions.HA_CLUSTER_ID;
/**
* Class handling the command line interface to the YARN session.
@@ -644,9 +644,9 @@ public class FlinkYarnSessionCli implements CustomCommandLine<YarnClusterClient>
String zkNamespace = cmd.hasOption(zookeeperNamespace.getOpt()) ?
cmd.getOptionValue(zookeeperNamespace.getOpt())
: yarnDescriptor.getFlinkConfiguration()
- .getString(HA_ZOOKEEPER_NAMESPACE, cmd.getOptionValue(applicationId.getOpt()));
+ .getString(HA_CLUSTER_ID, cmd.getOptionValue(applicationId.getOpt()));
LOG.info("Going to use the ZK namespace: {}", zkNamespace);
- yarnDescriptor.getFlinkConfiguration().setString(HA_ZOOKEEPER_NAMESPACE, zkNamespace);
+ yarnDescriptor.getFlinkConfiguration().setString(HA_CLUSTER_ID, zkNamespace);
try {
yarnCluster = yarnDescriptor.retrieve(cmd.getOptionValue(applicationId.getOpt()));