hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject hadoop git commit: HDFS-11946. Ozone: Containers in different datanodes are mapped to the same location. Contributed by Nandakumar
Date Tue, 13 Jun 2017 09:26:13 GMT
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 0a05da9a8 -> 0688a1c25


HDFS-11946. Ozone: Containers in different datanodes are mapped to the same location. Contributed
by  Nandakumar


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

Branch: refs/heads/HDFS-7240
Commit: 0688a1c25a4649c96d47179507dcfad1caa7a75d
Parents: 0a05da9
Author: Tsz-Wo Nicholas Sze <szetszwo@hortonworks.com>
Authored: Tue Jun 13 17:25:20 2017 +0800
Committer: Tsz-Wo Nicholas Sze <szetszwo@hortonworks.com>
Committed: Tue Jun 13 17:25:20 2017 +0800

----------------------------------------------------------------------
 .../test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0688a1c2/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 51b3ee1..38692e3 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
@@ -111,6 +111,11 @@ public final class MiniOzoneCluster extends MiniDFSCluster
         String.valueOf(NetUtils.createSocketAddr(address).getPort()));
     setConf(i, dnConf, OzoneConfigKeys.DFS_CONTAINER_RATIS_DATANODE_STORAGE_DIR,
         getInstanceStorageDir(i, -1).getCanonicalPath());
+    String containerMetaDirs = dnConf.get(
+        OzoneConfigKeys.OZONE_CONTAINER_METADATA_DIRS) + "-dn-" + i;
+    Files.createDirectories(Paths.get(containerMetaDirs));
+    setConf(i, dnConf, OzoneConfigKeys.OZONE_CONTAINER_METADATA_DIRS,
+        containerMetaDirs);
   }
 
   static void setConf(int i, Configuration conf, String key, String value) {
@@ -406,7 +411,7 @@ public final class MiniOzoneCluster extends MiniDFSCluster
 
       // If user has not specified a path, create a UUID for this miniCluster
       // and create SCM under that directory.
-      Path scmPath = Paths.get(path, runID.toString(), "scm");
+      Path scmPath = Paths.get(path, runID.toString(), "cont-meta");
       Files.createDirectories(scmPath);
       conf.set(OzoneConfigKeys.OZONE_CONTAINER_METADATA_DIRS, scmPath
           .toString());


---------------------------------------------------------------------
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