Revert "HDFS-10668. Fix intermittently failing UT TestDataNodeMXBean#testDataNodeMXBeanBlockCount. Contributed by Mingliang Liu."
This reverts commit 7cac7655fd84ac394250705b31e3927fe548e34a. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2aa18e19 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2aa18e19 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2aa18e19 Branch: refs/heads/HADOOP-12756 Commit: 2aa18e19252bb70737e1264acd6389f2bbd1c307 Parents: 7cac765 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jul 26 14:30:02 2016 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Jul 26 14:30:02 2016 +0100 ---------------------------------------------------------------------- .../server/datanode/TestDataNodeMXBean.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2aa18e19/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java index e7b2c7c..2a3ed3b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java @@ -25,13 +25,11 @@ import java.util.Map; import javax.management.MBeanServer; import javax.management.ObjectName; -import com.google.common.base.Supplier; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DFSTestUtil; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.hadoop.test.GenericTestUtils; import org.junit.Assert; import org.junit.Test; import org.mortbay.util.ajax.JSON; @@ -121,18 +119,10 @@ public class TestDataNodeMXBean { cluster.waitActive(); assertEquals("After restart DN", 5, getTotalNumBlocks(mbs, mxbeanName)); fs.delete(new Path("/tmp.txt1"), true); - // The total numBlocks should be updated after one file is deleted - GenericTestUtils.waitFor(new Supplier<Boolean>() { - @Override - public Boolean get() { - try { - return getTotalNumBlocks(mbs, mxbeanName) == 4; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - }, 100, 30000); + // Wait till replica gets deleted on disk. + Thread.sleep(5000); + assertEquals("After delete one file", 4, + getTotalNumBlocks(mbs, mxbeanName)); } finally { if (cluster != null) { cluster.shutdown(); @@ -141,7 +131,7 @@ public class TestDataNodeMXBean { } @SuppressWarnings("unchecked") - private int getTotalNumBlocks(MBeanServer mbs, ObjectName mxbeanName) + int getTotalNumBlocks(MBeanServer mbs, ObjectName mxbeanName) throws Exception { int totalBlocks = 0; String volumeInfo = (String) mbs.getAttribute(mxbeanName, "VolumeInfo"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
