Repository: hadoop Updated Branches: refs/heads/HDFS-7240 9cb63fdba -> 9e2873db2
HDFS-11903. Ozone: Cleaning up local storage when closing MiniOzoneCluster. Contributed by Mingliang Liu Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e2873db Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e2873db Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e2873db Branch: refs/heads/HDFS-7240 Commit: 9e2873db29f763b46f06a05692679c81c81797d1 Parents: 9cb63fd Author: Mingliang Liu <[email protected]> Authored: Wed May 31 15:00:09 2017 -0700 Committer: Mingliang Liu <[email protected]> Committed: Wed May 31 15:00:09 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/ozone/MiniOzoneCluster.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e2873db/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java index 5cfcaff..bc1ade9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.ozone; +import java.io.File; import java.util.Optional; import com.google.common.base.Preconditions; import org.apache.commons.io.FileUtils; @@ -126,6 +127,15 @@ public final class MiniOzoneCluster extends MiniDFSCluster String errorMessage = "Cleaning up metadata directories failed." + e; assertFalse(errorMessage, true); } + + try { + final String localStorage = + conf.getTrimmed(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT, + OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT_DEFAULT); + FileUtils.deleteDirectory(new File(localStorage)); + } catch (IOException e) { + LOG.error("Cleaning up local storage failed", e); + } } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
