Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
23e30f09
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,发现更多精彩内容 >>
提交
23e30f09
编写于
10月 18, 2014
作者:
R
Robert Metzger
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-1170] address pull request review comments
This closes #158
上级
b6f599f1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
35 addition
and
18 deletion
+35
-18
flink-core/src/main/java/org/apache/flink/api/common/io/LocatableInputSplitAssigner.java
...ache/flink/api/common/io/LocatableInputSplitAssigner.java
+1
-2
flink-core/src/main/java/org/apache/flink/util/NetUtils.java
flink-core/src/main/java/org/apache/flink/util/NetUtils.java
+3
-0
flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java
...apache/flink/runtime/instance/InstanceConnectionInfo.java
+31
-16
未找到文件。
flink-core/src/main/java/org/apache/flink/api/common/io/LocatableInputSplitAssigner.java
浏览文件 @
23e30f09
...
...
@@ -180,8 +180,7 @@ public final class LocatableInputSplitAssigner implements InputSplitAssigner {
return
false
;
}
for
(
String
h
:
hosts
)
{
final
String
hadoopHost
=
NetUtils
.
getHostnameFromFQDN
(
h
.
toLowerCase
());
if
(
h
!=
null
&&
hadoopHost
.
toLowerCase
().
equals
(
flinkHost
))
{
if
(
h
!=
null
&&
NetUtils
.
getHostnameFromFQDN
(
h
.
toLowerCase
()).
equals
(
flinkHost
))
{
return
true
;
}
}
...
...
flink-core/src/main/java/org/apache/flink/util/NetUtils.java
浏览文件 @
23e30f09
...
...
@@ -26,6 +26,9 @@ public class NetUtils {
* @return
*/
public
static
String
getHostnameFromFQDN
(
String
fqdn
)
{
if
(
fqdn
==
null
)
{
throw
new
IllegalArgumentException
(
"Input string is null (fqdn)"
);
}
int
dotPos
=
fqdn
.
indexOf
(
'.'
);
if
(
dotPos
==
-
1
)
{
return
fqdn
;
...
...
flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java
浏览文件 @
23e30f09
...
...
@@ -63,7 +63,13 @@ public class InstanceConnectionInfo implements IOReadableWritable, Comparable<In
/**
* The hostname
*/
private
String
hostname
;
private
String
hostName
;
/**
* This flag indicates if the FQDN hostname cound not be resolved and is represented
* as an IP address (string).
*/
private
boolean
fqdnHostNameIsIP
=
false
;
/**
...
...
@@ -94,6 +100,19 @@ public class InstanceConnectionInfo implements IOReadableWritable, Comparable<In
this
.
ipcPort
=
ipcPort
;
this
.
dataPort
=
dataPort
;
this
.
inetAddress
=
inetAddress
;
// get FQDN hostname on this TaskManager.
try
{
this
.
fqdnHostName
=
this
.
inetAddress
.
getCanonicalHostName
();
}
catch
(
Throwable
t
)
{
LOG
.
warn
(
"Unable to determine hostname for TaskManager. The performance might be degraded since HDFS input split assignment is not possible"
);
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"getCanonicalHostName() Exception"
,
t
);
}
// could not determine host name, so take IP textual representation
this
.
fqdnHostName
=
inetAddress
.
getHostAddress
();
this
.
fqdnHostNameIsIP
=
true
;
}
}
/**
...
...
@@ -135,27 +154,19 @@ public class InstanceConnectionInfo implements IOReadableWritable, Comparable<In
* @return the host name of the instance
*/
public
String
getFQDNHostname
()
{
if
(
this
.
fqdnHostName
==
null
)
{
try
{
this
.
fqdnHostName
=
this
.
inetAddress
.
getCanonicalHostName
();
}
catch
(
Throwable
t
)
{
LOG
.
warn
(
"Unable to determine hostname for TaskManager. The performance might be degraded since HDFS input split assignment is not possible"
);
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"getCanonicalHostName() Exception"
,
t
);
}
// could not determine host name, so take IP textual representation
this
.
fqdnHostName
=
inetAddress
.
getHostAddress
();
}
}
return
this
.
fqdnHostName
;
}
public
String
getHostname
()
{
if
(
host
n
ame
==
null
)
{
if
(
host
N
ame
==
null
)
{
String
fqdn
=
getFQDNHostname
();
hostname
=
NetUtils
.
getHostnameFromFQDN
(
fqdn
);
if
(
this
.
fqdnHostNameIsIP
)
{
// fqdn to hostname translation is pointless if FQDN is an ip address.
hostName
=
fqdn
;
}
else
{
hostName
=
NetUtils
.
getHostnameFromFQDN
(
fqdn
);
}
}
return
host
n
ame
;
return
host
N
ame
;
}
public
String
getInetAdress
()
{
...
...
@@ -177,6 +188,8 @@ public class InstanceConnectionInfo implements IOReadableWritable, Comparable<In
this
.
dataPort
=
in
.
readInt
();
this
.
fqdnHostName
=
StringUtils
.
readNullableString
(
in
);
this
.
hostName
=
StringUtils
.
readNullableString
(
in
);
this
.
fqdnHostNameIsIP
=
in
.
readBoolean
();
try
{
this
.
inetAddress
=
InetAddress
.
getByAddress
(
address
);
...
...
@@ -195,6 +208,8 @@ public class InstanceConnectionInfo implements IOReadableWritable, Comparable<In
out
.
writeInt
(
this
.
dataPort
);
StringUtils
.
writeNullableString
(
fqdnHostName
,
out
);
StringUtils
.
writeNullableString
(
hostName
,
out
);
out
.
writeBoolean
(
fqdnHostNameIsIP
);
}
// --------------------------------------------------------------------------------------------
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录