diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html index f45da5605f..9fa43a3085 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html @@ -509,5 +509,6 @@ + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html index 8c577001b2..4bf2e2bd7f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html @@ -489,6 +489,7 @@ diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js index 86502ddc13..42fb059f09 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js @@ -580,45 +580,3 @@ load_page(); }); })(); - -function open_hostip_list(x0, x1) { - close_hostip_list(); - var ips = new Array(); - for (var i = 0; i < liveNodes.length; i++) { - var dn = liveNodes[i]; - var index = (dn.usedSpace / dn.capacity) * 100.0; - if (index == 0) { - index = 1; - } - //More than 100% do not care,so not record in 95%-100% bar - if (index > x0 && index <= x1) { - ips.push(dn.infoAddr.split(":")[0]); - } - } - var ipsText = ''; - for (var i = 0; i < ips.length; i++) { - ipsText += ips[i] + '\n'; - } - var histogram_div = document.getElementById('datanode-usage-histogram'); - histogram_div.setAttribute('style', 'position: relative'); - var ips_div = document.createElement("textarea"); - ips_div.setAttribute('id', 'datanode_ips'); - ips_div.setAttribute('rows', '8'); - ips_div.setAttribute('cols', '14'); - ips_div.setAttribute('style', 'position: absolute;top: 0px;right: -38px;'); - ips_div.setAttribute('readonly', 'readonly'); - histogram_div.appendChild(ips_div); - - var close_div = document.createElement("div"); - histogram_div.appendChild(close_div); - close_div.setAttribute('id', 'close_ips'); - close_div.setAttribute('style', 'position: absolute;top: 0px;right: -62px;width:20px;height;20px'); - close_div.setAttribute('onclick', 'close_hostip_list()'); - close_div.innerHTML = "X"; - ips_div.innerHTML = ipsText; -} - -function close_hostip_list() { - $("#datanode_ips").remove(); - $("#close_ips").remove(); -} diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/histogram-hostip.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/histogram-hostip.js new file mode 100644 index 0000000000..eff8e506aa --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/histogram-hostip.js @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +function open_hostip_list(x0, x1) { + close_hostip_list(); + var ips = new Array(); + for (var i = 0; i < liveNodes.length; i++) { + var dn = liveNodes[i]; + var index = (dn.usedSpace / dn.capacity) * 100.0; + if (index == 0) { + index = 1; + } + //More than 100% do not care,so not record in 95%-100% bar + if (index > x0 && index <= x1) { + ips.push(dn.infoAddr.split(":")[0]); + } + } + var ipsText = ''; + for (var i = 0; i < ips.length; i++) { + ipsText += ips[i] + '\n'; + } + var histogram_div = document.getElementById('datanode-usage-histogram'); + histogram_div.setAttribute('style', 'position: relative'); + var ips_div = document.createElement("textarea"); + ips_div.setAttribute('id', 'datanode_ips'); + ips_div.setAttribute('rows', '8'); + ips_div.setAttribute('cols', '14'); + ips_div.setAttribute('style', 'position: absolute;top: 0px;right: -38px;'); + ips_div.setAttribute('readonly', 'readonly'); + histogram_div.appendChild(ips_div); + + var close_div = document.createElement("div"); + histogram_div.appendChild(close_div); + close_div.setAttribute('id', 'close_ips'); + close_div.setAttribute('style', 'position: absolute;top: 0px;right: -62px;width:20px;height;20px'); + close_div.setAttribute('onclick', 'close_hostip_list()'); + close_div.innerHTML = "X"; + ips_div.innerHTML = ipsText; +} + +function close_hostip_list() { + $("#datanode_ips").remove(); + $("#close_ips").remove(); +}