http://git-wip-us.apache.org/repos/asf/hadoop/blob/79df1e75/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java index 38c17b7..7cdbde2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java @@ -947,7 +947,8 @@ public class TestFsck { DatanodeDescriptor dnDesc0 = dnm.getDatanode( cluster.getDataNodes().get(0).getDatanodeId()); - bm.getDatanodeManager().getDecomManager().startDecommission(dnDesc0); + bm.getDatanodeManager().getDatanodeAdminManager().startDecommission( + dnDesc0); final String dn0Name = dnDesc0.getXferAddr(); // check the replica status while decommissioning @@ -1000,7 +1001,7 @@ public class TestFsck { cluster.getDataNodes().get(1).getDatanodeId()); final String dn1Name = dnDesc1.getXferAddr(); - bm.getDatanodeManager().getDecomManager().startMaintenance(dnDesc1, + bm.getDatanodeManager().getDatanodeAdminManager().startMaintenance(dnDesc1, Long.MAX_VALUE); // check the replica status while entering maintenance @@ -1539,7 +1540,7 @@ public class TestFsck { fsn.writeUnlock(); } DatanodeDescriptor dn = bc.getBlocks()[0].getDatanode(0); - bm.getDatanodeManager().getDecomManager().startDecommission(dn); + bm.getDatanodeManager().getDatanodeAdminManager().startDecommission(dn); String dnName = dn.getXferAddr(); //wait for decommission start @@ -1619,7 +1620,7 @@ public class TestFsck { DatanodeManager dnm = bm.getDatanodeManager(); DatanodeDescriptor dn = dnm.getDatanode(cluster.getDataNodes().get(0) .getDatanodeId()); - bm.getDatanodeManager().getDecomManager().startMaintenance(dn, + bm.getDatanodeManager().getDatanodeAdminManager().startMaintenance(dn, Long.MAX_VALUE); final String dnName = dn.getXferAddr(); @@ -1854,7 +1855,7 @@ public class TestFsck { } DatanodeDescriptor dn = bc.getBlocks()[0] .getDatanode(0); - bm.getDatanodeManager().getDecomManager().startDecommission(dn); + bm.getDatanodeManager().getDatanodeAdminManager().startDecommission(dn); String dnName = dn.getXferAddr(); // wait for decommission start @@ -1933,7 +1934,7 @@ public class TestFsck { DatanodeManager dnm = bm.getDatanodeManager(); DatanodeDescriptor dn = dnm.getDatanode(cluster.getDataNodes().get(0) .getDatanodeId()); - bm.getDatanodeManager().getDecomManager().startMaintenance(dn, + bm.getDatanodeManager().getDatanodeAdminManager().startMaintenance(dn, Long.MAX_VALUE); final String dnName = dn.getXferAddr();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/79df1e75/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java index 63f9113..937bb61 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java @@ -370,7 +370,7 @@ public class TestNameNodeMXBean { cluster.getDataNodes().get(0).getDisplayName()); fsn.getBlockManager().getDatanodeManager().refreshNodes(conf); - // Wait for the DecommissionManager to complete refresh nodes + // Wait for the DatanodeAdminManager to complete refresh nodes GenericTestUtils.waitFor(new Supplier<Boolean>() { @Override public Boolean get() { @@ -399,7 +399,7 @@ public class TestNameNodeMXBean { assertEquals(0, fsn.getNumDecomLiveDataNodes()); assertEquals(0, fsn.getNumDecomDeadDataNodes()); - // Wait for the DecommissionManager to complete check + // Wait for the DatanodeAdminManager to complete check GenericTestUtils.waitFor(new Supplier<Boolean>() { @Override public Boolean get() { @@ -501,7 +501,7 @@ public class TestNameNodeMXBean { assertEquals(0, fsn.getNumInMaintenanceDeadDataNodes()); } - // Wait for the DecommissionManager to complete check + // Wait for the DatanodeAdminManager to complete check // and perform state transition while (fsn.getNumInMaintenanceLiveDataNodes() != 1) { Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS); http://git-wip-us.apache.org/repos/asf/hadoop/blob/79df1e75/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java index c9fe2c3..b7f0cfc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java @@ -349,18 +349,18 @@ public class TestNamenodeCapacityReport { private void startDecommissionOrMaintenance(DatanodeManager dnm, DatanodeDescriptor dnd, boolean decomm) { if (decomm) { - dnm.getDecomManager().startDecommission(dnd); + dnm.getDatanodeAdminManager().startDecommission(dnd); } else { - dnm.getDecomManager().startMaintenance(dnd, Long.MAX_VALUE); + dnm.getDatanodeAdminManager().startMaintenance(dnd, Long.MAX_VALUE); } } private void stopDecommissionOrMaintenance(DatanodeManager dnm, DatanodeDescriptor dnd, boolean decomm) { if (decomm) { - dnm.getDecomManager().stopDecommission(dnd); + dnm.getDatanodeAdminManager().stopDecommission(dnd); } else { - dnm.getDecomManager().stopMaintenance(dnd); + dnm.getDatanodeAdminManager().stopMaintenance(dnd); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
