Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HDFS-12499. dfs.namenode.shared.edits.dir property is currently namenode specific key. Contributed by Bharat Viswanadham." 

This reverts commit f09725537e.
This commit is contained in:
Andrew Wang 2017-10-31 10:46:19 -07:00
parent e259030066
commit ae08fe518b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
View File

@ -248,6 +248,7 @@ public class NameNode extends ReconfigurableBase implements
DFS_NAMENODE_RPC_BIND_HOST_KEY, DFS_NAMENODE_RPC_BIND_HOST_KEY,
DFS_NAMENODE_NAME_DIR_KEY, DFS_NAMENODE_NAME_DIR_KEY,
DFS_NAMENODE_EDITS_DIR_KEY, DFS_NAMENODE_EDITS_DIR_KEY,
DFS_NAMENODE_SHARED_EDITS_DIR_KEY,
DFS_NAMENODE_CHECKPOINT_DIR_KEY, DFS_NAMENODE_CHECKPOINT_DIR_KEY,
DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY, DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY,
DFS_NAMENODE_LIFELINE_RPC_ADDRESS_KEY, DFS_NAMENODE_LIFELINE_RPC_ADDRESS_KEY,
@ -277,8 +278,7 @@ public class NameNode extends ReconfigurableBase implements
* for a specific namenode. * for a specific namenode.
*/ */
public static final String[] NAMESERVICE_SPECIFIC_KEYS = { 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; private String ipcClientRPCBackoffEnable;

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
View File

@ -402,7 +402,7 @@ public class TestDFSUtil {
public void testSomeConfsNNSpecificSomeNSSpecific() { public void testSomeConfsNNSpecificSomeNSSpecific() {
final HdfsConfiguration conf = new HdfsConfiguration(); 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, "global-default");
conf.set(key + ".ns1", "ns1-override"); conf.set(key + ".ns1", "ns1-override");
conf.set(key + ".ns1.nn1", "nn1-override"); conf.set(key + ".ns1.nn1", "nn1-override");