Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11290. TestFSNameSystemMBean should wait until JMX cache is cleared. Contributed by Erik Krogen. 

(cherry picked from commit b1a9ec856b)
This commit is contained in:
Akira Ajisaka 2017-01-18 17:53:21 +09:00
parent 42a14b6db9
commit db47bd15dd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java
View File

@ -34,6 +34,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.metrics2.impl.ConfigBuilder;
import org.apache.hadoop.metrics2.impl.TestMetricsConfig;
import org.junit.Test; import org.junit.Test;
import org.mortbay.util.ajax.JSON; import org.mortbay.util.ajax.JSON;
@ -139,12 +141,16 @@ public class TestFSNamesystemMBean {
MiniDFSCluster cluster = null; MiniDFSCluster cluster = null;
FSNamesystem fsn = null; FSNamesystem fsn = null;
int jmxCachePeriod = 1;
new ConfigBuilder().add("namenode.period", jmxCachePeriod)
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-namenode"));
try { try {
cluster = new MiniDFSCluster.Builder(conf).build(); cluster = new MiniDFSCluster.Builder(conf).build();
cluster.waitActive(); cluster.waitActive();
fsn = cluster.getNameNode().namesystem; fsn = cluster.getNameNode().namesystem;
fsn.writeLock(); fsn.writeLock();
Thread.sleep(jmxCachePeriod * 1000);
MBeanClient client = new MBeanClient(); MBeanClient client = new MBeanClient();
client.start(); client.start();
@ -167,11 +173,15 @@ public class TestFSNamesystemMBean {
@Test @Test
public void testWithFSEditLogLock() throws Exception { public void testWithFSEditLogLock() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
int jmxCachePeriod = 1;
new ConfigBuilder().add("namenode.period", jmxCachePeriod)
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-namenode"));
MiniDFSCluster cluster = null; MiniDFSCluster cluster = null;
try { try {
cluster = new MiniDFSCluster.Builder(conf).build(); cluster = new MiniDFSCluster.Builder(conf).build();
cluster.waitActive(); cluster.waitActive();
synchronized (cluster.getNameNode().getFSImage().getEditLog()) { synchronized (cluster.getNameNode().getFSImage().getEditLog()) {
Thread.sleep(jmxCachePeriod * 1000);
MBeanClient client = new MBeanClient(); MBeanClient client = new MBeanClient();
client.start(); client.start();
client.join(20000); client.join(20000);