Author: atm
Date: Sat Feb 25 22:48:02 2012
New Revision: 1293716
URL: http://svn.apache.org/viewvc?rev=1293716&view=rev
Log:
HDFS-2978. The NameNode should expose name dir statuses via JMX. Contributed by
Aaron T. Myers.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1293716&r1=1293715&r2=1293716&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Feb 25 22:48:02 2012
@@ -6,6 +6,9 @@ Release 1.1.0 - unreleased
MAPREDUCE-3118. Backport Gridmix and Rumen features to
branch-0.20-security (Ravi Gummadi via amarrk)
+
+ HDFS-2978. The NameNode should expose name dir statuses via JMX. (atm)
+
BUG FIXES
HDFS-2305. Running multiple 2NNs can result in corrupt file system. (atm)
Modified:
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1293716&r1=1293715&r2=1293716&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Sat Feb 25 22:48:02 2012
@@ -83,6 +83,8 @@ import org.apache.hadoop.hdfs.security.t
import org.apache.hadoop.hdfs.server.common.GenerationStamp;
import org.apache.hadoop.hdfs.server.common.HdfsConstants;
import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirType;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
import org.apache.hadoop.hdfs.server.common.Storage;
import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
@@ -5799,6 +5801,30 @@ public class FSNamesystem implements FSC
return JSON.toString(info);
}
+ @Override // NameNodeMXBean
+ public String getNameDirStatuses() {
+ Map<String, Map<File, StorageDirType>> statusMap =
+ new HashMap<String, Map<File, StorageDirType>>();
+
+ Map<File, StorageDirType> activeDirs = new HashMap<File, StorageDirType>();
+ for (Iterator<StorageDirectory> it
+ = getFSImage().dirIterator(); it.hasNext();) {
+ StorageDirectory st = it.next();
+ activeDirs.put(st.getRoot(), st.getStorageDirType());
+ }
+ statusMap.put("active", activeDirs);
+
+ List<Storage.StorageDirectory> removedStorageDirs
+ = getFSImage().getRemovedStorageDirs();
+ Map<File, StorageDirType> failedDirs = new HashMap<File, StorageDirType>();
+ for (StorageDirectory st : removedStorageDirs) {
+ failedDirs.put(st.getRoot(), st.getStorageDirType());
+ }
+ statusMap.put("failed", failedDirs);
+
+ return JSON.toString(statusMap);
+ }
+
private long getLastContact(DatanodeDescriptor alivenode) {
return (System.currentTimeMillis() - alivenode.getLastUpdate())/1000;
}
Modified:
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java?rev=1293716&r1=1293715&r2=1293716&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
(original)
+++
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
Sat Feb 25 22:48:02 2012
@@ -135,4 +135,12 @@ public interface NameNodeMXBean {
* @return the decommissioning node information
*/
public String getDecomNodes();
+
+ /**
+ * Get status information about the directories storing image and edits logs
+ * of the NN.
+ *
+ * @return the name dir status information, as a JSON string.
+ */
+ public String getNameDirStatuses();
}
Modified:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java?rev=1293716&r1=1293715&r2=1293716&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
(original)
+++
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
Sat Feb 25 22:48:02 2012
@@ -17,23 +17,32 @@
*/
package org.apache.hadoop.hdfs.server.namenode;
+import static org.junit.Assert.*;
+
+import java.io.File;
import java.lang.management.ManagementFactory;
+import java.util.Collection;
+import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
import org.apache.hadoop.util.VersionInfo;
import org.junit.Test;
+import org.mortbay.util.ajax.JSON;
+
import junit.framework.Assert;
/**
* Class for testing {@link NameNodeMXBean} implementation
*/
public class TestNameNodeMXBean {
+ @SuppressWarnings({ "unchecked", "deprecation" })
@Test
public void testNameNodeMXBeanInfo() throws Exception {
Configuration conf = new Configuration();
@@ -84,8 +93,44 @@ public class TestNameNodeMXBean {
String deadnodeinfo = (String) (mbs.getAttribute(mxbeanName,
"DeadNodes"));
Assert.assertEquals(fsn.getDeadNodes(), deadnodeinfo);
+ // get attribute NameDirStatuses
+ String nameDirStatuses = (String) (mbs.getAttribute(mxbeanName,
+ "NameDirStatuses"));
+ Assert.assertEquals(fsn.getNameDirStatuses(), nameDirStatuses);
+ Map<String, Map<String, String>> statusMap =
+ (Map<String, Map<String, String>>) JSON.parse(nameDirStatuses);
+ Collection<File> nameDirs = cluster.getNameDirs();
+ for (File nameDir : nameDirs) {
+ System.out.println("Checking for the presence of " + nameDir +
+ " in active name dirs.");
+
assertTrue(statusMap.get("active").containsKey(nameDir.getAbsolutePath()));
+ }
+ assertEquals(2, statusMap.get("active").size());
+ assertEquals(0, statusMap.get("failed").size());
+
+ // This will cause the first dir to fail.
+ File failedNameDir = nameDirs.toArray(new File[0])[0];
+ assertEquals(0, FileUtil.chmod(failedNameDir.getAbsolutePath(), "000"));
+ cluster.getNameNode().rollEditLog();
+
+ nameDirStatuses = (String) (mbs.getAttribute(mxbeanName,
+ "NameDirStatuses"));
+ statusMap = (Map<String, Map<String, String>>)
JSON.parse(nameDirStatuses);
+ for (File nameDir : nameDirs) {
+ String expectedStatus =
+ nameDir.equals(failedNameDir) ? "failed" : "active";
+ System.out.println("Checking for the presence of " + nameDir +
+ " in " + expectedStatus + " name dirs.");
+ assertTrue(statusMap.get(expectedStatus).containsKey(
+ nameDir.getAbsolutePath()));
+ }
+ assertEquals(1, statusMap.get("active").size());
+ assertEquals(1, statusMap.get("failed").size());
} finally {
if (cluster != null) {
+ for (File dir : cluster.getNameDirs()) {
+ FileUtil.chmod(dir.toString(), "700");
+ }
cluster.shutdown();
}
}
