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 xy...@apache.org on 2017/11/01 22:22:42 UTC
[35/44] hadoop git commit: HDFS-12499. dfs.namenode.shared.edits.dir
property is currently namenode specific key. Contributed by Bharat
Viswanadham.
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/HDFS-7240
Commit: b922ba7393bd97b98e90f50f01b4cc664c44adb9
Parents: 982bd2a
Author: Arpit Agarwal <ar...@apache.org>
Authored: Tue Oct 31 10:08:05 2017 -0700
Committer: Arpit Agarwal <ar...@apache.org>
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