Revert "HDFS-12499. dfs.namenode.shared.edits.dir property is currently namenode specific key. Contributed by Bharat Viswanadham."
This reverts commit b922ba7393bd97b98e90f50f01b4cc664c44adb9. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f681fa8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f681fa8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f681fa8 Branch: refs/heads/YARN-1011 Commit: 5f681fa8216fb43dff8a3d21bf21e91d6c6f6d9c Parents: b922ba7 Author: Andrew Wang <w...@apache.org> Authored: Tue Oct 31 10:46:10 2017 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Tue Oct 31 10:46:10 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/5f681fa8/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 6125dea..32b873b 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f681fa8/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 64d2322..39f76a5 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"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
