Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
b5db8d90
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b5db8d90
编写于
12月 29, 2017
作者:
T
Till Rohrmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[hotfix] Replace HighAvailabilityOptions#HA_ZOOKEEPER_NAMESPACE with HA_CLUSTER_ID
上级
c4acbb83
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
10 deletion
+5
-10
flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
.../java/org/apache/flink/configuration/ConfigConstants.java
+2
-2
flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
...g/apache/flink/configuration/HighAvailabilityOptions.java
+0
-5
flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
...n/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
+3
-3
未找到文件。
flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
浏览文件 @
b5db8d90
...
...
@@ -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"
;
...
...
flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
浏览文件 @
b5db8d90
...
...
@@ -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"
)
...
...
flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
浏览文件 @
b5db8d90
...
...
@@ -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
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录