HDFS-8292. Move conditional in fmt_time from dfs-dust.js to status.html. Contributed by Charles Lamb.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/87e99782 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/87e99782 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/87e99782 Branch: refs/heads/HDFS-7240 Commit: 87e997823581790cce8d82d20e5e82ef9dd80670 Parents: 5f8112f Author: Andrew Wang <[email protected]> Authored: Thu Apr 30 18:23:13 2015 -0700 Committer: Andrew Wang <[email protected]> Committed: Thu Apr 30 18:23:13 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +- .../hadoop-hdfs/src/main/webapps/static/dfs-dust.js | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/87e99782/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 29e3f85..7e4a6f2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -488,6 +488,9 @@ Release 2.8.0 - UNRELEASED HDFS-8200. Refactor FSDirStatAndListingOp. (wheat9) + HDFS-8292. Move conditional in fmt_time from dfs-dust.js to status.html. + (Charles Lamb via wang) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/87e99782/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html index 2ef58ad..72f3ff7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html @@ -65,7 +65,7 @@ <tr><th>Compiled</th><td>{CompileInfo}</td></tr> <tr><th>NameNode Address</th><td>{HostAndPort}</td></tr> <tr><th>Started</th><td>{StartTime|date_tostring}</td></tr> - <tr><th>Last Checkpoint</th><td>{@if cond="{LastCheckpointTime} === 0"}Never{:else}{LastCheckpointTime|date_tostring} ({LastCheckpointDeltaMs|fmt_time} ago){/if}</td></tr> + <tr><th>Last Checkpoint</th><td>{@if cond="{LastCheckpointTime} === 0"}Never{:else}{LastCheckpointTime|date_tostring}{/if} {@if cond="{LastCheckpointDeltaMs} >= 0"} ({LastCheckpointDeltaMs|fmt_time} ago){/if}</td></tr> <tr><th>Checkpoint Period</th><td>{CheckpointPeriod} seconds</td></tr> <tr><th>Checkpoint Transactions</th><td>{TxnCount}</td></tr> </table> http://git-wip-us.apache.org/repos/asf/hadoop/blob/87e99782/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 f483d23..3c8efd9 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 @@ -40,9 +40,6 @@ }, 'fmt_time': function (v) { - if (v < 0) { - return "unknown"; - } var s = Math.floor(v / 1000), h = Math.floor(s / 3600); s -= h * 3600; var m = Math.floor(s / 60);
