Repository: hadoop Updated Branches: refs/heads/trunk 00804e245 -> 65ccf2b12
HDFS-8388. Time and Date format need to be in sync in NameNode UI page. Contributed by Surendra Singh Lilhore. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65ccf2b1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65ccf2b1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65ccf2b1 Branch: refs/heads/trunk Commit: 65ccf2b1252a5c83755fa24a93cf1d30ee59b2c3 Parents: 00804e2 Author: Akira Ajisaka <aajis...@apache.org> Authored: Wed Sep 2 14:28:38 2015 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Wed Sep 2 14:28:38 2015 +0900 ---------------------------------------------------------------------- .../hadoop-common/src/site/markdown/Metrics.md | 2 ++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 5 +++++ .../apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java | 6 ++++++ .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 5 ++--- .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js | 6 +++--- .../hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 1 + .../hadoop-hdfs/src/main/webapps/hdfs/explorer.js | 2 +- .../hadoop-hdfs/src/main/webapps/static/dfs-dust.js | 8 +++++++- 9 files changed, 30 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md index de706ad..8722968 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md @@ -192,6 +192,8 @@ Each metrics record contains tags such as ProcessName, SessionId, and Hostname a | `PutImageNumOps` | Total number of fsimage uploads to SecondaryNameNode | | `PutImageAvgTime` | Average fsimage upload time in milliseconds | | `TotalFileOps`| Total number of file operations performed | +| `NNStarted`| NameNode start time | +| `NNStartedTimeInMillis`| NameNode start time in milliseconds | FSNamesystem ------------ http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index ea398f2..14a9248 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1270,6 +1270,9 @@ Release 2.8.0 - UNRELEASED HDFS-8950. NameNode refresh doesn't remove DataNodes that are no longer in the allowed list (Daniel Templeton) + HDFS-8388. Time and Date format need to be in sync in NameNode UI page. + (Surendra Singh Lilhore via aajisaka) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index f4952f7..adcb1d6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -6131,6 +6131,11 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, return getStartTime().toString(); } + @Override // NameNodeMXBean + public long getNNStartedTimeInMillis() { + return startTime; + } + @Override // NameNodeMXBean public String getCompileInfo() { return VersionInfo.getDate() + " by " + VersionInfo.getUser() + http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java index 0e4d445..00c1abe 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java @@ -239,6 +239,12 @@ public interface NameNodeMXBean { public String getNNStarted(); /** + * Gets the NN start time in milliseconds. + * @return the NN start time in msec + */ + long getNNStartedTimeInMillis(); + + /** * Get the compilation information which contains date, user and branch * * @return the compilation information, as a JSON string. http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html ---------------------------------------------------------------------- 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 38808ca..36f8bfe 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 @@ -130,9 +130,9 @@ <tr><th>Namenode ID:</th><td>{NamenodeID}</td></tr> {/HAInfo} {#nn} - <tr><th>Started:</th><td>{NNStarted}</td></tr> + <tr><th>Started:</th><td>{NNStartedTimeInMillis|date_tostring}</td></tr> <tr><th>Version:</th><td>{Version}</td></tr> - <tr><th>Compiled:</th><td>{CompileInfo}</td></tr> + <tr><th>Compiled:</th><td>{CompileInfo|format_compile_info}</td></tr> <tr><th>Cluster ID:</th><td>{ClusterId}</td></tr> <tr><th>Block Pool ID:</th><td>{BlockPoolId}</td></tr> {/nn} @@ -423,7 +423,6 @@ There are no reported volume failures. </script><script type="text/javascript" src="/static/bootstrap-3.0.2/js/bootstrap.min.js"> </script><script type="text/javascript" src="/static/dataTables.bootstrap.js"> </script><script type="text/javascript" src="/static/moment.min.js"> -</script><script type="text/javascript" src="/static/moment.min.js"> </script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js"> </script><script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js"> </script><script type="text/javascript" src="/static/dfs-dust.js"> http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js ---------------------------------------------------------------------- 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 03b27fe..9bc1b5d 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 @@ -57,7 +57,7 @@ 'helper_date_tostring' : function (chunk, ctx, bodies, params) { var value = dust.helpers.tap(params.value, chunk, ctx); - return chunk.write('' + new Date(Number(value)).toLocaleString()); + return chunk.write('' + moment(Number(value)).format('ddd MMM DD HH:mm:ss ZZ YYYY')); } }; @@ -175,7 +175,7 @@ var HELPERS = { 'helper_relative_time' : function (chunk, ctx, bodies, params) { var value = dust.helpers.tap(params.value, chunk, ctx); - return chunk.write(moment().subtract(Number(value), 'seconds').format('YYYY-MM-DD HH:mm:ss')); + return chunk.write(moment().subtract(Number(value), 'seconds').format('ddd MMM DD HH:mm:ss ZZ YYYY')); }, 'helper_usage_bar' : function (chunk, ctx, bodies, params) { var value = dust.helpers.tap(params.value, chunk, ctx); @@ -262,7 +262,7 @@ var HELPERS = { 'helper_date_tostring' : function (chunk, ctx, bodies, params) { var value = dust.helpers.tap(params.value, chunk, ctx); - return chunk.write('' + new Date(Number(value)).toLocaleString()); + return chunk.write('' + moment(Number(value)).format('ddd MMM DD HH:mm:ss ZZ YYYY')); } }; http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html index fbea6ad..e805915 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html @@ -199,6 +199,7 @@ </script><script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js"> </script><script type="text/javascript" src="/static/dfs-dust.js"> </script><script type="text/javascript" src="explorer.js"> + </script><script type="text/javascript" src="/static/moment.min.js"> </script> </body> </html> http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js index 5572880..46f48b8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js @@ -146,7 +146,7 @@ var HELPERS = { 'helper_date_tostring' : function (chunk, ctx, bodies, params) { var value = dust.helpers.tap(params.value, chunk, ctx); - return chunk.write('' + new Date(Number(value)).toLocaleString()); + return chunk.write('' + moment(Number(value)).format('ddd MMM DD HH:mm:ss ZZ YYYY')); } }; var url = '/webhdfs/v1' + encode_path(dir) + '?op=LISTSTATUS'; http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ccf2b1/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js index 3c8efd9..466e058 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js @@ -58,9 +58,15 @@ }, 'date_tostring' : function (v) { - return new Date(Number(v)).toLocaleString(); + return moment(Number(v)).format('ddd MMM DD HH:mm:ss ZZ YYYY'); }, + 'format_compile_info' : function (v) { + var info = v.split(" by ") + var date = moment(info[0]).format('ddd MMM DD HH:mm:ss ZZ YYYY'); + return date.concat(" by ").concat(info[1]); + }, + 'helper_to_permission': function (v) { var symbols = [ '---', '--x', '-w-', '-wx', 'r--', 'r-x', 'rw-', 'rwx' ]; var vInt = parseInt(v, 8);