Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-6230. Merge r1594040 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594041 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Haohui Mai 2014-05-12 18:04:01 +00:00
parent c579bef2fc
commit ab40d65107
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -94,6 +94,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6328. Clean up dead code in FSDirectory. (wheat9) HDFS-6328. Clean up dead code in FSDirectory. (wheat9)
HDFS-6230. Expose upgrade status through NameNode web UI.
(Mit Desai via wheat9)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn) HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)

6
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
View File

@ -72,7 +72,7 @@
<script type="text/x-dust-template" id="tmpl-dfshealth"> <script type="text/x-dust-template" id="tmpl-dfshealth">
{#nn} {#nn}
{@if cond="{DistinctVersionCount} > 1 || '{RollingUpgradeStatus}'.length"} {@if cond="{DistinctVersionCount} > 1 || '{RollingUpgradeStatus}'.length || !'{UpgradeFinalized}'"}
<div class="alert alert-dismissable alert-info"> <div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
@ -92,6 +92,10 @@
{key} ({value}) {@sep},{/sep} {key} ({value}) {@sep},{/sep}
{/DistinctVersions} {/DistinctVersions}
{/if} {/if}
{^UpgradeFinalized}
<p>Upgrade in progress. Not yet finalized.</p>
{/UpgradeFinalized}
</div> </div>
{/if} {/if}