You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by wh...@apache.org on 2014/05/12 20:04:01 UTC
svn commit: r1594041 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/main/webapps/hdfs/dfshealth.html
Author: wheat9
Date: Mon May 12 18:04:01 2014
New Revision: 1594041
URL: http://svn.apache.org/r1594041
Log:
HDFS-6230. Merge r1594040 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.html
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=1594041&r1=1594040&r2=1594041&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 Mon May 12 18:04:01 2014
@@ -94,6 +94,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6328. Clean up dead code in FSDirectory. (wheat9)
+ HDFS-6230. Expose upgrade status through NameNode web UI.
+ (Mit Desai via wheat9)
+
OPTIMIZATIONS
HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html?rev=1594041&r1=1594040&r2=1594041&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html Mon May 12 18:04:01 2014
@@ -72,7 +72,7 @@
<script type="text/x-dust-template" id="tmpl-dfshealth">
{#nn}
-{@if cond="{DistinctVersionCount} > 1 || '{RollingUpgradeStatus}'.length"}
+{@if cond="{DistinctVersionCount} > 1 || '{RollingUpgradeStatus}'.length || !'{UpgradeFinalized}'"}
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
@@ -92,6 +92,10 @@
{key} ({value}) {@sep},{/sep}
{/DistinctVersions}
{/if}
+
+ {^UpgradeFinalized}
+ <p>Upgrade in progress. Not yet finalized.</p>
+ {/UpgradeFinalized}
</div>
{/if}