Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 626FF200C5B for ; Thu, 13 Apr 2017 00:52:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 61174160BAC; Wed, 12 Apr 2017 22:52:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ABA6D160BA9 for ; Thu, 13 Apr 2017 00:52:29 +0200 (CEST) Received: (qmail 50125 invoked by uid 500); 12 Apr 2017 22:52:27 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 49761 invoked by uid 99); 12 Apr 2017 22:52:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Apr 2017 22:52:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14A60E96A4; Wed, 12 Apr 2017 22:52:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liuml07@apache.org To: common-commits@hadoop.apache.org Date: Wed, 12 Apr 2017 22:52:31 -0000 Message-Id: <9d2d343e884c40ae8ea90587b01195a4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/50] hadoop git commit: HDFS-11362. StorageDirectory should initialize a non-null default StorageDirType. Contribute by Hanisha Koneru. archived-at: Wed, 12 Apr 2017 22:52:30 -0000 HDFS-11362. StorageDirectory should initialize a non-null default StorageDirType. Contribute by Hanisha Koneru. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a49fac53 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a49fac53 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a49fac53 Branch: refs/heads/HADOOP-13345 Commit: a49fac5302128a6f5d971f5818d0fd874c3932e3 Parents: 1b081ca Author: Xiaoyu Yao Authored: Thu Apr 6 14:13:22 2017 -0700 Committer: Xiaoyu Yao Committed: Thu Apr 6 14:33:16 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/common/Storage.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a49fac53/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java index 4493772..414d3a7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java @@ -43,6 +43,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NodeType; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption; import org.apache.hadoop.hdfs.server.datanode.StorageLocation; +import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType; import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo; import org.apache.hadoop.io.nativeio.NativeIO; import org.apache.hadoop.io.nativeio.NativeIOException; @@ -275,12 +276,10 @@ public abstract class Storage extends StorageInfo { private final StorageLocation location; public StorageDirectory(File dir) { - // default dirType is null this(dir, null, false); } public StorageDirectory(StorageLocation location) { - // default dirType is null this(null, false, location); } @@ -337,7 +336,8 @@ public abstract class Storage extends StorageInfo { boolean isShared, StorageLocation location) { this.root = dir; this.lock = null; - this.dirType = dirType; + // default dirType is UNDEFINED + this.dirType = (dirType == null ? NameNodeDirType.UNDEFINED : dirType); this.isShared = isShared; this.location = location; assert location == null || dir == null || --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org