Author: wheat9
Date: Wed Mar 19 23:58:24 2014
New Revision: 1579474
URL: http://svn.apache.org/r1579474
Log:
HDFS-6105. Merge r1579468 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1579474&r1=1579473&r2=1579474&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Mar 19 23:58:24 2014
@@ -411,6 +411,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6100. DataNodeWebHdfsMethods does not failover in HA mode. (Haohui Mai
via jing9)
+ HDFS-6105. NN web UI for DN list loads the same jmx page multiple times.
+ (wheat9)
+
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js?rev=1579474&r1=1579473&r2=1579474&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
Wed Mar 19 23:58:24 2014
@@ -80,12 +80,10 @@
var base = dust.makeBase(HELPERS);
dust.render('dfshealth', base.push(data), function(err, out) {
$('#tab-overview').html(out);
- $('a[href="#tab-datanode"]').click(load_datanode_info);
$('#ui-tabs a[href="#tab-overview"]').tab('show');
});
}
}
- $('#ui-tabs a[href="#tab-overview"]').click(load_overview);
function show_err_msg(msg) {
$('#alert-panel-body').html(msg);
@@ -140,8 +138,6 @@
}).error(ajax_error_handler);
}
- $('#ui-tabs a[href="#tab-startup-progress"]').click(load_startup_progress);
-
function load_datanode_info() {
function workaround(r) {
function node_map_to_array(nodes) {
@@ -171,8 +167,6 @@
})).error(ajax_error_handler);
}
- $('a[href="#tab-datanode"]').click(load_datanode_info);
-
function load_snapshot_info() {
$.get(
'/jmx?qry=Hadoop:service=NameNode,name=FSNamesystemState',
@@ -185,8 +179,6 @@
})).error(ajax_error_handler);
}
- $('#ui-tabs a[href="#tab-snapshot"]').click(load_snapshot_info);
-
function load_page() {
var hash = window.location.hash;
switch(hash) {
