Author: wheat9
Date: Mon Mar 3 19:51:33 2014
New Revision: 1573700
URL: http://svn.apache.org/r1573700
Log:
HDFS-6013. add rollingUpgrade information to latest UI. Contributed by
Vinayakumar B.
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/RollingUpgradeInfo.java
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt?rev=1573700&r1=1573699&r2=1573700&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
Mon Mar 3 19:51:33 2014
@@ -130,3 +130,7 @@ HDFS-5535 subtasks:
HDFS-6034. Use DataNodeLayoutVersion for DN registration check and do not
verify layout version if there is a rolling upgrade in progress.
(szetszwo)
+
+ HDFS-6013. add rollingUpgrade information to latest UI.
+ (Vinayakumar B via wheat9)
+
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/RollingUpgradeInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/RollingUpgradeInfo.java?rev=1573700&r1=1573699&r2=1573700&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/RollingUpgradeInfo.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/RollingUpgradeInfo.java
Mon Mar 3 19:51:33 2014
@@ -94,4 +94,34 @@ public class RollingUpgradeInfo extends
private static String timestamp2String(long timestamp) {
return new Date(timestamp) + " (=" + timestamp + ")";
}
+
+ public static class Bean {
+ private final String blockPoolId;
+ private final long startTime;
+ private final long finalizeTime;
+ private final boolean createdRollbackImages;
+
+ public Bean(RollingUpgradeInfo f) {
+ this.blockPoolId = f.getBlockPoolId();
+ this.startTime = f.startTime;
+ this.finalizeTime = f.finalizeTime;
+ this.createdRollbackImages = f.createdRollbackImages();
+ }
+
+ public String getBlockPoolId() {
+ return blockPoolId;
+ }
+
+ public long getStartTime() {
+ return startTime;
+ }
+
+ public long getFinalizeTime() {
+ return finalizeTime;
+ }
+
+ public boolean isCreatedRollbackImages() {
+ return createdRollbackImages;
+ }
+ }
}
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1573700&r1=1573699&r2=1573700&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Mon Mar 3 19:51:33 2014
@@ -7247,6 +7247,20 @@ public class FSNamesystem implements Nam
this.needRollbackFsImage = needRollbackFsImage;
}
+ @Override // NameNodeMXBean
+ public RollingUpgradeInfo.Bean getRollingUpgradeStatus() {
+ readLock();
+ try {
+ RollingUpgradeInfo upgradeInfo = getRollingUpgradeInfo();
+ if (upgradeInfo != null) {
+ return new RollingUpgradeInfo.Bean(upgradeInfo);
+ }
+ return null;
+ } finally {
+ readUnlock();
+ }
+ }
+
/** Is rolling upgrade in progress? */
public boolean isRollingUpgrade() {
return rollingUpgradeInfo != null;
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java?rev=1573700&r1=1573699&r2=1573700&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
Mon Mar 3 19:51:33 2014
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hdfs.protocol.RollingUpgradeInfo;
/**
* This is the JMX management interface for namenode information
@@ -78,7 +79,14 @@ public interface NameNodeMXBean {
* @return true, if upgrade is finalized
*/
public boolean isUpgradeFinalized();
-
+
+ /**
+ * Gets the RollingUpgrade information
+ *
+ * @return Rolling upgrade information
+ */
+ public RollingUpgradeInfo.Bean getRollingUpgradeStatus();
+
/**
* Gets total used space by data nodes for non DFS purposes such as storing
* temporary files on the local file system
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html?rev=1573700&r1=1573699&r2=1573700&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
Mon Mar 3 19:51:33 2014
@@ -72,14 +72,26 @@
<script type="text/x-dust-template" id="tmpl-dfshealth">
{#nn}
-{@if cond="{DistinctVersionCount} > 1"}
+{@if cond="{DistinctVersionCount} > 1 || '{RollingUpgradeStatus}'.length"}
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert"
aria-hidden="true">×</button>
- There are {DistinctVersionCount} versions of datanodes currently live:
- {#DistinctVersions}
- {key} ({value}) {@sep},{/sep}
- {/DistinctVersions}
+ {#RollingUpgradeStatus}
+ <p>Rolling upgrade started at {#helper_date_tostring
value="{startTime}"/}. </br>
+ {#createdRollbackImages}
+ Rollback image has been created. Proceed to upgrade daemons.
+ {:else}
+ Rollback image has not been created.
+ {/createdRollbackImages}
+ </p>
+ {/RollingUpgradeStatus}
+
+ {@if cond="{DistinctVersionCount} > 1"}
+ There are {DistinctVersionCount} versions of datanodes currently live:
+ {#DistinctVersions}
+ {key} ({value}) {@sep},{/sep}
+ {/DistinctVersions}
+ {/if}
</div>
{/if}
Modified:
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js?rev=1573700&r1=1573699&r2=1573700&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
Mon Mar 3 19:51:33 2014
@@ -44,6 +44,11 @@
for (var i in j) {
chunk.write('<tr><td>' + i + '</td><td>' + j[i] + '</td><td>' +
params.type + '</td></tr>');
}
+ },
+
+ '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());
}
};
