From f4529316bd27620fd60bc382830a090581495544 Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Wed, 1 Mar 2017 11:30:32 -0800 Subject: [PATCH] HDFS-11474. Ozone: TestContainerMapping needs to cleanup levelDB files.Contributed by Xiaoyu Yao. --- .../hadoop/ozone/scm/container/TestContainerMapping.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerMapping.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerMapping.java index 9186a2028b8..d83053aa9ca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerMapping.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerMapping.java @@ -17,6 +17,7 @@ package org.apache.hadoop.ozone.scm.container; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.container.common.SCMTestUtils; import org.apache.hadoop.scm.container.common.helpers.Pipeline; @@ -42,6 +43,8 @@ import java.util.UUID; public class TestContainerMapping { private static ContainerMapping mapping; private static MockNodeManager nodeManager; + private static File testDir; + @Rule public ExpectedException thrown = ExpectedException.none(); @BeforeClass @@ -53,7 +56,7 @@ public class TestContainerMapping { TestContainerMapping.class.getSimpleName()); conf.set(OzoneConfigKeys.OZONE_CONTAINER_METADATA_DIRS, path); - File testDir = Paths.get(path).toFile(); + testDir = Paths.get(path).toFile(); boolean folderExisted = testDir.exists() || testDir.mkdirs(); if (!folderExisted) { throw new IOException("Unable to create test diectory path"); @@ -65,6 +68,7 @@ public class TestContainerMapping { @AfterClass public static void cleanup() throws IOException { mapping.close(); + FileUtil.fullyDelete(testDir); } @Before