hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From x...@apache.org
Subject hadoop git commit: HDFS-11952. Ozone: Fix TestContainerSQLCli#testConvertContainerDB. Contributed by Weiwei Yang.
Date Thu, 08 Jun 2017 17:08:07 GMT
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 23d7d613d -> 058129bca


HDFS-11952. Ozone: Fix TestContainerSQLCli#testConvertContainerDB. Contributed by Weiwei Yang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/058129bc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/058129bc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/058129bc

Branch: refs/heads/HDFS-7240
Commit: 058129bca7484e7f6caf271d8cb433eb9bd138b4
Parents: 23d7d61
Author: Xiaoyu Yao <xyao@apache.org>
Authored: Thu Jun 8 10:07:16 2017 -0700
Committer: Xiaoyu Yao <xyao@apache.org>
Committed: Thu Jun 8 10:07:16 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/058129bc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerMapping.java
----------------------------------------------------------------------
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 2b57249..164b0c2 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 class ContainerMapping implements Mapping {
     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();


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message