From 2aa18e19252bb70737e1264acd6389f2bbd1c307 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Tue, 26 Jul 2016 14:30:02 +0100
Subject: [PATCH] Revert "HDFS-10668. Fix intermittently failing UT
 TestDataNodeMXBean#testDataNodeMXBeanBlockCount. Contributed by Mingliang
 Liu."

This reverts commit 7cac7655fd84ac394250705b31e3927fe548e34a.
---
 .../server/datanode/TestDataNodeMXBean.java   | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

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 e7b2c7cf5d3..2a3ed3b4fda 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 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 void testDataNodeMXBeanBlockCount() throws Exception {
       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 Boolean get() {
   }
 
   @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");