Revert "HDFS-10668. Fix intermittently failing UT TestDataNodeMXBean#testDataNodeMXBeanBlockCount. Contributed by Mingliang Liu."
This reverts commit 7cac7655fd
.
This commit is contained in:
parent
7cac7655fd
commit
2aa18e1925
@ -25,13 +25,11 @@
|
|||||||
import javax.management.MBeanServer;
|
import javax.management.MBeanServer;
|
||||||
import javax.management.ObjectName;
|
import javax.management.ObjectName;
|
||||||
|
|
||||||
import com.google.common.base.Supplier;
|
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
import org.apache.hadoop.fs.FileSystem;
|
import org.apache.hadoop.fs.FileSystem;
|
||||||
import org.apache.hadoop.fs.Path;
|
import org.apache.hadoop.fs.Path;
|
||||||
import org.apache.hadoop.hdfs.DFSTestUtil;
|
import org.apache.hadoop.hdfs.DFSTestUtil;
|
||||||
import org.apache.hadoop.hdfs.MiniDFSCluster;
|
import org.apache.hadoop.hdfs.MiniDFSCluster;
|
||||||
import org.apache.hadoop.test.GenericTestUtils;
|
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.mortbay.util.ajax.JSON;
|
import org.mortbay.util.ajax.JSON;
|
||||||
@ -121,18 +119,10 @@ public void testDataNodeMXBeanBlockCount() throws Exception {
|
|||||||
cluster.waitActive();
|
cluster.waitActive();
|
||||||
assertEquals("After restart DN", 5, getTotalNumBlocks(mbs, mxbeanName));
|
assertEquals("After restart DN", 5, getTotalNumBlocks(mbs, mxbeanName));
|
||||||
fs.delete(new Path("/tmp.txt1"), true);
|
fs.delete(new Path("/tmp.txt1"), true);
|
||||||
// The total numBlocks should be updated after one file is deleted
|
// Wait till replica gets deleted on disk.
|
||||||
GenericTestUtils.waitFor(new Supplier<Boolean>() {
|
Thread.sleep(5000);
|
||||||
@Override
|
assertEquals("After delete one file", 4,
|
||||||
public Boolean get() {
|
getTotalNumBlocks(mbs, mxbeanName));
|
||||||
try {
|
|
||||||
return getTotalNumBlocks(mbs, mxbeanName) == 4;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, 100, 30000);
|
|
||||||
} finally {
|
} finally {
|
||||||
if (cluster != null) {
|
if (cluster != null) {
|
||||||
cluster.shutdown();
|
cluster.shutdown();
|
||||||
@ -141,7 +131,7 @@ public Boolean get() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
private int getTotalNumBlocks(MBeanServer mbs, ObjectName mxbeanName)
|
int getTotalNumBlocks(MBeanServer mbs, ObjectName mxbeanName)
|
||||||
throws Exception {
|
throws Exception {
|
||||||
int totalBlocks = 0;
|
int totalBlocks = 0;
|
||||||
String volumeInfo = (String) mbs.getAttribute(mxbeanName, "VolumeInfo");
|
String volumeInfo = (String) mbs.getAttribute(mxbeanName, "VolumeInfo");
|
||||||
|
Loading…
Reference in New Issue
Block a user