Repository: hadoop Updated Branches: refs/heads/branch-2 171b18693 -> 0add328c8
HDFS-11411. Avoid OutOfMemoryError in TestMaintenanceState test runs. (Manoj Govindassamy via mingma) (cherry picked from commit cfcd527323352cf2a851c5c41f5d243d375d88d0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0add328c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0add328c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0add328c Branch: refs/heads/branch-2 Commit: 0add328c8c1d86f08793682d7a37a7b30509e28b Parents: 171b186 Author: Ming Ma <[email protected]> Authored: Wed Feb 22 09:41:07 2017 -0800 Committer: Ming Ma <[email protected]> Committed: Wed Feb 22 09:42:47 2017 -0800 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0add328c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java index bbf947f..f3e2a0b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java @@ -333,6 +333,7 @@ public class TestMaintenanceState extends AdminStatesBaseTest { private void testExpectedReplication(int replicationFactor, int expectedReplicasInRead) throws IOException { + setup(); startCluster(1, 5); final Path file = new Path("/testExpectedReplication.dat"); @@ -352,6 +353,7 @@ public class TestMaintenanceState extends AdminStatesBaseTest { nodeOutofService)); cleanupFile(fileSys, file); + teardown(); } /** @@ -492,6 +494,7 @@ public class TestMaintenanceState extends AdminStatesBaseTest { private void testDecommissionDifferentNodeAfterMaintenance(int repl) throws Exception { + setup(); startCluster(1, 5); final Path file = @@ -519,6 +522,7 @@ public class TestMaintenanceState extends AdminStatesBaseTest { assertNull(checkWithRetry(ns, fileSys, file, repl + 1, null)); cleanupFile(fileSys, file); + teardown(); } /** @@ -583,6 +587,7 @@ public class TestMaintenanceState extends AdminStatesBaseTest { */ private void testChangeReplicationFactor(int oldFactor, int newFactor, int expectedLiveReplicas) throws IOException { + setup(); LOG.info("Starting testChangeReplicationFactor {} {} {}", oldFactor, newFactor, expectedLiveReplicas); startCluster(1, 5); @@ -615,6 +620,7 @@ public class TestMaintenanceState extends AdminStatesBaseTest { assertNull(checkWithRetry(ns, fileSys, file, newFactor, null)); cleanupFile(fileSys, file); + teardown(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
