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 4E1A0200D2E for ; Tue, 31 Oct 2017 18:23:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4CB76160BFA; Tue, 31 Oct 2017 17:23:07 +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 96F55160BFB for ; Tue, 31 Oct 2017 18:23:06 +0100 (CET) Received: (qmail 81705 invoked by uid 500); 31 Oct 2017 17:23:05 -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 81637 invoked by uid 99); 31 Oct 2017 17:23:05 -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; Tue, 31 Oct 2017 17:23:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31824DFBCA; Tue, 31 Oct 2017 17:23:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Message-Id: <5567ba8b8ef04abb943337e6d89ef4c1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-12499. dfs.namenode.shared.edits.dir property is currently namenode specific key. Contributed by Bharat Viswanadham. Date: Tue, 31 Oct 2017 17:23:05 +0000 (UTC) archived-at: Tue, 31 Oct 2017 17:23:07 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 982bd2a5b -> b922ba739 HDFS-12499. dfs.namenode.shared.edits.dir property is currently namenode specific key. Contributed by Bharat Viswanadham. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b922ba73 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b922ba73 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b922ba73 Branch: refs/heads/trunk Commit: b922ba7393bd97b98e90f50f01b4cc664c44adb9 Parents: 982bd2a Author: Arpit Agarwal Authored: Tue Oct 31 10:08:05 2017 -0700 Committer: Arpit Agarwal Committed: Tue Oct 31 10:23:00 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/namenode/NameNode.java | 4 ++-- .../src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b922ba73/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java index 32b873b..6125dea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java @@ -248,7 +248,6 @@ public class NameNode extends ReconfigurableBase implements DFS_NAMENODE_RPC_BIND_HOST_KEY, DFS_NAMENODE_NAME_DIR_KEY, DFS_NAMENODE_EDITS_DIR_KEY, - DFS_NAMENODE_SHARED_EDITS_DIR_KEY, DFS_NAMENODE_CHECKPOINT_DIR_KEY, DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY, DFS_NAMENODE_LIFELINE_RPC_ADDRESS_KEY, @@ -278,7 +277,8 @@ public class NameNode extends ReconfigurableBase implements * for a specific namenode. */ public static final String[] NAMESERVICE_SPECIFIC_KEYS = { - DFS_HA_AUTO_FAILOVER_ENABLED_KEY + DFS_HA_AUTO_FAILOVER_ENABLED_KEY, + DFS_NAMENODE_SHARED_EDITS_DIR_KEY }; private String ipcClientRPCBackoffEnable; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b922ba73/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java index 39f76a5..64d2322 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java @@ -402,7 +402,7 @@ public class TestDFSUtil { public void testSomeConfsNNSpecificSomeNSSpecific() { final HdfsConfiguration conf = new HdfsConfiguration(); - String key = DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY; + String key = DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY; conf.set(key, "global-default"); conf.set(key + ".ns1", "ns1-override"); conf.set(key + ".ns1.nn1", "nn1-override"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org