Skip to content

HDFS-17834. Fix invalid HTTP links for DataNodes in IPv6 environment #8080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

HDFS-17834. Fix invalid HTTP links for DataNodes in IPv6 environment #8080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,28 @@
for (var i = 0, e = nodes.length; i < e; ++i) {
var n = nodes[i];
n.usedPercentage = Math.round((n.used + n.nonDfsUsedSpace) * 1.0 / n.capacity * 100);
var port = n.infoAddr.split(":")[1];
var securePort = n.infoSecureAddr.split(":")[1];
// 处理IPv6地址的infoAddr
var infoAddrParts = n.infoAddr.split("]:");
var port = "50075";
var dnHost = n.name.split(":")[0];
if (infoAddrParts.length > 1) {
// IPv6地址格式 [xxxx:xxxx:...]:port
port = infoAddrParts[1];
} else {
// IPv4地址格式 host:port
var parts = n.infoAddr.split(":");
port = parts[1];
}
// 同样方式处理安全端口
var securePort = "0";
if (n.infoSecureAddr) {
var secureAddrParts = n.infoSecureAddr.split("]:");
if (secureAddrParts.length > 1) {
securePort = secureAddrParts[1];
} else {
securePort = n.infoSecureAddr.split(":")[1];
}
}
n.dnWebAddress = "http://" + dnHost + ":" + port;
if (securePort != 0) {
n.dnWebAddress = "https://" + dnHost + ":" + securePort;
Expand Down
23 changes: 21 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,28 @@
var n = nodes[i];
n.usedPercentage = Math.round((n.used + n.nonDfsUsedSpace) * 1.0 / n.capacity * 100);

var port = n.infoAddr.split(":")[1];
var securePort = n.infoSecureAddr.split(":")[1];
// 处理IPv6地址的infoAddr
var infoAddrParts = n.infoAddr.split("]:");
var port = "50075";
var dnHost = n.name.split(":")[0];
if (infoAddrParts.length > 1) {
// IPv6地址格式 [xxxx:xxxx:...]:port
port = infoAddrParts[1];
} else {
// IPv4地址格式 host:port
var parts = n.infoAddr.split(":");
port = parts[1];
}
// 同样方式处理安全端口
var securePort = "0";
if (n.infoSecureAddr) {
var secureAddrParts = n.infoSecureAddr.split("]:");
if (secureAddrParts.length > 1) {
securePort = secureAddrParts[1];
} else {
securePort = n.infoSecureAddr.split(":")[1];
}
}
n.dnWebAddress = "http://" + dnHost + ":" + port;
if (securePort != 0) {
n.dnWebAddress = "https://" + dnHost + ":" + securePort;
Expand Down