Author: kihwal
Date: Mon May 19 18:02:25 2014
New Revision: 1595984
URL: http://svn.apache.org/r1595984
Log:
svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows
inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam.
Fixing merge error
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java?rev=1595984&r1=1595983&r2=1595984&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
Mon May 19 18:02:25 2014
@@ -19,6 +19,7 @@ package org.apache.hadoop.hdfs.server.na
import static org.junit.Assert.assertTrue;
+import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
import java.net.URL;
@@ -36,6 +37,9 @@ import org.apache.hadoop.hdfs.MiniDFSClu
import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
import org.junit.Test;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
/**
* DFS_HOSTS and DFS_HOSTS_EXCLUDE tests
*
