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

HDFS-13202. Fix the outdated javadocs in HAUtil. Contributed by Chao Sun.

This commit is contained in:
Yiqun Lin 2018-03-01 17:51:43 +08:00
parent 10663b78c8
commit ececeea8f2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
View File

@ -147,10 +147,10 @@ public class HAUtil {
} }
/** /**
* Get the NN ID of the other node in an HA setup. * Get the NN ID of the other nodes in an HA setup.
* *
* @param conf the configuration of this node * @param conf the configuration of this node
* @return the NN ID of the other node in this nameservice * @return a list of NN IDs of other nodes in this nameservice
*/ */
public static List<String> getNameNodeIdOfOtherNodes(Configuration conf, String nsId) { public static List<String> getNameNodeIdOfOtherNodes(Configuration conf, String nsId) {
Preconditions.checkArgument(nsId != null, Preconditions.checkArgument(nsId != null,
@ -183,26 +183,26 @@ public class HAUtil {
} }
/** /**
* Given the configuration for this node, return a Configuration object for * Given the configuration for this node, return a list of configurations
* the other node in an HA setup. * for the other nodes in an HA setup.
* *
* @param myConf the configuration of this node * @param myConf the configuration of this node
* @return the configuration of the other node in an HA setup * @return a list of configuration of other nodes in an HA setup
*/ */
public static List<Configuration> getConfForOtherNodes( public static List<Configuration> getConfForOtherNodes(
Configuration myConf) { Configuration myConf) {
String nsId = DFSUtil.getNamenodeNameServiceId(myConf); String nsId = DFSUtil.getNamenodeNameServiceId(myConf);
List<String> otherNn = getNameNodeIdOfOtherNodes(myConf, nsId); List<String> otherNodes = getNameNodeIdOfOtherNodes(myConf, nsId);
// Look up the address of the other NNs // Look up the address of the other NNs
List<Configuration> confs = new ArrayList<Configuration>(otherNn.size()); List<Configuration> confs = new ArrayList<Configuration>(otherNodes.size());
myConf = new Configuration(myConf); myConf = new Configuration(myConf);
// unset independent properties // unset independent properties
for (String idpKey : HA_SPECIAL_INDEPENDENT_KEYS) { for (String idpKey : HA_SPECIAL_INDEPENDENT_KEYS) {
myConf.unset(idpKey); myConf.unset(idpKey);
} }
for (String nn : otherNn) { for (String nn : otherNodes) {
Configuration confForOtherNode = new Configuration(myConf); Configuration confForOtherNode = new Configuration(myConf);
NameNode.initializeGenericKeys(confForOtherNode, nsId, nn); NameNode.initializeGenericKeys(confForOtherNode, nsId, nn);
confs.add(confForOtherNode); confs.add(confForOtherNode);