You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2017/06/06 23:50:44 UTC
hadoop git commit: HDFS-11568. Ozone: Create metadata path
automatically after null checking. Contributed by Mukul Kumar Singh.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 245c6fed9 -> 74ab30399
HDFS-11568. Ozone: Create metadata path automatically after null checking. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/74ab3039
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/74ab3039
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/74ab3039
Branch: refs/heads/HDFS-7240
Commit: 74ab30399325efc78c286c89780c749ba2a2ff07
Parents: 245c6fe
Author: Anu Engineer <ae...@apache.org>
Authored: Tue Jun 6 16:46:15 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Tue Jun 6 16:46:15 2017 -0700
----------------------------------------------------------------------
.../apache/hadoop/ozone/scm/block/BlockManagerImpl.java | 10 +++-------
.../hadoop/ozone/scm/container/ContainerMapping.java | 11 +++--------
.../apache/hadoop/ozone/scm/node/SCMNodePoolManager.java | 9 +++------
3 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74ab3039/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java
index 80027db..8e49b5f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java
@@ -20,11 +20,11 @@ package org.apache.hadoop.ozone.scm.block;
import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSUtil;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.scm.container.Mapping;
import org.apache.hadoop.ozone.scm.exceptions.SCMException;
import org.apache.hadoop.ozone.scm.node.NodeManager;
+import org.apache.hadoop.ozone.web.utils.OzoneUtils;
import org.apache.hadoop.scm.ScmConfigKeys;
import org.apache.hadoop.scm.container.common.helpers.AllocatedBlock;
import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -100,12 +100,8 @@ public class BlockManagerImpl implements BlockManager {
this.nodeManager = nodeManager;
this.containerManager = containerManager;
this.cacheSize = cacheSizeMB;
- String scmMetaDataDir = conf.get(OzoneConfigKeys
- .OZONE_CONTAINER_METADATA_DIRS);
- if ((scmMetaDataDir == null) || (scmMetaDataDir.isEmpty())) {
- throw
- new IllegalArgumentException("SCM metadata directory is not valid.");
- }
+ File metaDir = OzoneUtils.getScmMetadirPath(conf);
+ String scmMetaDataDir = metaDir.getPath();
Options options = new Options();
options.cacheSize(this.cacheSize * OzoneConsts.MB);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74ab3039/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 95fd9fe..2b57249 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
@@ -22,12 +22,12 @@ import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.ozone.protocol.proto.OzoneProtos;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.scm.container.placement.algorithms.ContainerPlacementPolicy;
import org.apache.hadoop.ozone.scm.container.placement.algorithms.SCMContainerPlacementRandom;
import org.apache.hadoop.ozone.scm.exceptions.SCMException;
import org.apache.hadoop.ozone.scm.node.NodeManager;
+import org.apache.hadoop.ozone.web.utils.OzoneUtils;
import org.apache.hadoop.scm.ScmConfigKeys;
import org.apache.hadoop.scm.client.ScmClient;
import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -80,13 +80,8 @@ public class ContainerMapping implements Mapping {
this.nodeManager = nodeManager;
this.cacheSize = cacheSizeMB;
- // TODO: Fix this checking.
- String scmMetaDataDir = conf.get(OzoneConfigKeys
- .OZONE_CONTAINER_METADATA_DIRS);
- if ((scmMetaDataDir == null) || (scmMetaDataDir.isEmpty())) {
- throw
- new IllegalArgumentException("SCM metadata directory is not valid.");
- }
+ File metaDir = OzoneUtils.getScmMetadirPath(conf);
+ String scmMetaDataDir = metaDir.getParent();
Options options = new Options();
options.cacheSize(this.cacheSize * OzoneConsts.MB);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74ab3039/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodePoolManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodePoolManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodePoolManager.java
index 3ec5c1c..9c1821f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodePoolManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodePoolManager.java
@@ -22,10 +22,10 @@ import com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
import org.apache.hadoop.hdfs.protocol.proto.HdfsProtos;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.scm.exceptions.SCMException;
+import org.apache.hadoop.ozone.web.utils.OzoneUtils;
import org.apache.hadoop.utils.LevelDBStore;
import org.iq80.leveldb.DBIterator;
import org.iq80.leveldb.Options;
@@ -82,11 +82,8 @@ public final class SCMNodePoolManager implements NodePoolManager {
throws IOException {
final int cacheSize = conf.getInt(OZONE_SCM_DB_CACHE_SIZE_MB,
OZONE_SCM_DB_CACHE_SIZE_DEFAULT);
- String scmMetaDataDir = conf.get(OzoneConfigKeys
- .OZONE_CONTAINER_METADATA_DIRS);
- if (scmMetaDataDir == null) {
- throw new IllegalArgumentException("SCM metadata directory is invalid.");
- }
+ File metaDir = OzoneUtils.getScmMetadirPath(conf);
+ String scmMetaDataDir = metaDir.getPath();
Options options = new Options();
options.cacheSize(cacheSize * OzoneConsts.MB);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org