From ae08fe518b832c23a69fe859a62bb9cff32b6496 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Tue, 31 Oct 2017 10:46:19 -0700 Subject: [PATCH] Revert "HDFS-12499. dfs.namenode.shared.edits.dir property is currently namenode specific key. Contributed by Bharat Viswanadham." This reverts commit f09725537e4aef28c3e192a7aacad206900aa7b5. --- .../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(-) 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 6125dea1e33..32b873b3af6 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,6 +248,7 @@ 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, @@ -277,8 +278,7 @@ public class NameNode extends ReconfigurableBase implements * for a specific namenode. */ public static final String[] NAMESERVICE_SPECIFIC_KEYS = { - DFS_HA_AUTO_FAILOVER_ENABLED_KEY, - DFS_NAMENODE_SHARED_EDITS_DIR_KEY + DFS_HA_AUTO_FAILOVER_ENABLED_KEY }; private String ipcClientRPCBackoffEnable; 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 64d2322072e..39f76a57207 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_EDITS_DIR_KEY; + String key = DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY; conf.set(key, "global-default"); conf.set(key + ".ns1", "ns1-override"); conf.set(key + ".ns1.nn1", "nn1-override");