From 0add328c8c1d86f08793682d7a37a7b30509e28b Mon Sep 17 00:00:00 2001 From: Ming Ma Date: Wed, 22 Feb 2017 09:41:07 -0800 Subject: [PATCH] HDFS-11411. Avoid OutOfMemoryError in TestMaintenanceState test runs. (Manoj Govindassamy via mingma) (cherry picked from commit cfcd527323352cf2a851c5c41f5d243d375d88d0) --- .../java/org/apache/hadoop/hdfs/TestMaintenanceState.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 bbf947fc148..f3e2a0b65ef 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(); }