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 bo...@apache.org on 2010/10/02 01:40:00 UTC
svn commit: r1003708 - in /hadoop/hdfs/branches/HDFS-1052: ./
src/java/org/apache/hadoop/hdfs/server/datanode/
src/java/org/apache/hadoop/hdfs/server/namenode/
src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/
src/test/hdfs/org/apache/hadoop/hdfs/s...
Author: boryas
Date: Fri Oct 1 23:40:00 2010
New Revision: 1003708
URL: http://svn.apache.org/viewvc?rev=1003708&view=rev
Log:
HDFS-1428. HDFS federation : add cluster ID and block pool ID into Name node web UI
Modified:
hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Fri Oct 1 23:40:00 2010
@@ -46,6 +46,9 @@ Trunk (unreleased changes)
HDFS-1400. HDFS federation: DataTransferProtocol uses ExtendedBlockPool to
include BlockPoolID in the protocol. (suresh)
+ HDFS-1428. HDFS federation : add cluster ID and block pool ID into
+ Name node web UI(tanping via boryas)
+
IMPROVEMENTS
HDFS-1304. Add a new unit test for HftpFileSystem.open(..). (szetszwo)
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Fri Oct 1 23:40:00 2010
@@ -1976,4 +1976,10 @@ public class DataNode extends Configured
}
return JSON.toString(info);
}
+
+ @Override // DataNodeMXBean
+ public String getClusterId() {
+ return this.storage.clusterID;
+}
+
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java Fri Oct 1 23:40:00 2010
@@ -63,4 +63,12 @@ public interface DataNodeMXBean {
* @return the volume info
*/
public String getVolumeInfo();
+
+ /**
+ * Gets the cluster id.
+ *
+ * @return the cluster id
+ */
+ public String getClusterId();
+
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Fri Oct 1 23:40:00 2010
@@ -1043,6 +1043,7 @@ public class FSImage extends Storage {
FSNamesystem fsNamesys = getFSNamesystem();
FSDirectory fsDir = fsNamesys.dir;
+ fsNamesys.setBlockPoolId(this.getBlockPoolID());
//
// Load in bits
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Oct 1 23:40:00 2010
@@ -1528,6 +1528,10 @@ public class FSNamesystem implements FSC
return new ExtendedBlock(poolId, blk);
}
+ void setBlockPoolId(String bpid) {
+ poolId = bpid;
+ }
+
/**
* The client would like to obtain an additional block for the indicated
* filename (which is being written-to). Return an array that consists
@@ -5219,6 +5223,16 @@ public class FSNamesystem implements FSC
return alivenode.getDfsUsed();
}
+ @Override // NameNodeMXBean
+ public String getClusterId() {
+ return dir.fsImage.getClusterID();
+ }
+
+ @Override // NameNodeMXBean
+ public String getBlockpoolId() {
+ return dir.fsImage.getBlockPoolID();
+ }
+
public String getPoolId() {
return poolId;
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java Fri Oct 1 23:40:00 2010
@@ -56,6 +56,7 @@ public interface NameNodeMXBean {
*/
public long getTotal();
+
/**
* Gets the safemode status
*
@@ -135,4 +136,18 @@ public interface NameNodeMXBean {
* @return the decommissioning node information
*/
public String getDecomNodes();
+
+ /**
+ * Gets the cluster id.
+ *
+ * @return the cluster id
+ */
+ public String getClusterId();
+
+ /**
+ * Gets the block pool id.
+ *
+ * @return the block pool id
+ */
+ public String getBlockpoolId();
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java Fri Oct 1 23:40:00 2010
@@ -132,7 +132,12 @@ class NamenodeJspHelper {
+ "\n <tr><td id='col1'>Compiled:</td><td>" + VersionInfo.getDate()
+ " by " + VersionInfo.getUser() + " from " + VersionInfo.getBranch()
+ "\n <tr><td id='col1'>Upgrades:</td><td>"
- + getUpgradeStatusText(fsn) + "\n</table></div>";
+ + getUpgradeStatusText(fsn)
+ + "\n <tr><td id='col1'>Cluster ID:</td><td>" + fsn.getClusterId()
+ + "</td></tr>\n"
+ + "\n <tr><td id='col1'>Block Pool ID:</td><td>" + fsn.getBlockpoolId()
+ + "</td></tr>\n"
+ + "\n</table></div>";
}
static String getWarningText(FSNamesystem fsn) {
Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java Fri Oct 1 23:40:00 2010
@@ -44,6 +44,9 @@ public class TestDataNodeMXBean {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName mxbeanName = new ObjectName("HadoopInfo:type=DataNodeInfo");
+ // get attribute "ClusterId"
+ String clusterId = (String) mbs.getAttribute(mxbeanName, "ClusterId");
+ Assert.assertEquals(datanode.getClusterId(), clusterId);
// get attribute "Version"
String version = (String)mbs.getAttribute(mxbeanName, "Version");
Assert.assertEquals(datanode.getVersion(),version);
Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java?rev=1003708&r1=1003707&r2=1003708&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java Fri Oct 1 23:40:00 2010
@@ -46,6 +46,12 @@ public class TestNameNodeMXBean {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName mxbeanName = new ObjectName("HadoopInfo:type=NameNodeInfo");
+ // get attribute "ClusterId"
+ String clusterId = (String) mbs.getAttribute(mxbeanName, "ClusterId");
+ Assert.assertEquals(fsn.getClusterId(), clusterId);
+ // get attribute "BlockpoolId"
+ String blockpoolId = (String) mbs.getAttribute(mxbeanName, "BlockpoolId");
+ Assert.assertEquals(fsn.getBlockpoolId(), blockpoolId);
// get attribute "Version"
String version = (String) mbs.getAttribute(mxbeanName, "Version");
Assert.assertEquals(fsn.getVersion(), version);