From ddc88eaf885bd1f6c54a1df5ee8349f72418ffe7 Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Thu, 8 Jun 2017 10:07:16 -0700
Subject: [PATCH] HDFS-11952. Ozone: Fix
 TestContainerSQLCli#testConvertContainerDB. Contributed by Weiwei Yang.

---
 .../apache/hadoop/ozone/scm/container/ContainerMapping.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerMapping.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerMapping.java
index 2b572494ca..164b0c2735 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerMapping.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerMapping.java
@@ -81,12 +81,11 @@ public ContainerMapping(final Configuration conf,
     this.cacheSize = cacheSizeMB;
 
     File metaDir = OzoneUtils.getScmMetadirPath(conf);
-    String scmMetaDataDir = metaDir.getParent();
     Options options = new Options();
     options.cacheSize(this.cacheSize * OzoneConsts.MB);
 
     // Write the container name to pipeline mapping.
-    File containerDBPath = new File(scmMetaDataDir, CONTAINER_DB);
+    File containerDBPath = new File(metaDir, CONTAINER_DB);
     containerStore = new LevelDBStore(containerDBPath, options);
 
     this.lock = new ReentrantLock();