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 ae...@apache.org on 2018/03/03 01:01:23 UTC
[35/50] [abbrv] hadoop git commit: HDFS-13202. Fix the outdated
javadocs in HAUtil. Contributed by Chao Sun.
HDFS-13202. Fix the outdated javadocs in HAUtil. Contributed by Chao Sun.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ececeea8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ececeea8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ececeea8
Branch: refs/heads/HDFS-7240
Commit: ececeea8f2ba47b8618e22e52bc839f4f9ac511b
Parents: 10663b7
Author: Yiqun Lin <yq...@apache.org>
Authored: Thu Mar 1 17:51:43 2018 +0800
Committer: Yiqun Lin <yq...@apache.org>
Committed: Thu Mar 1 17:51:43 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hdfs/HAUtil.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ececeea8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
index 1d294be..fd63b69 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
@@ -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
- * @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) {
Preconditions.checkArgument(nsId != null,
@@ -183,26 +183,26 @@ public class HAUtil {
}
/**
- * Given the configuration for this node, return a Configuration object for
- * the other node in an HA setup.
+ * Given the configuration for this node, return a list of configurations
+ * for the other nodes in an HA setup.
*
* @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(
Configuration 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
- List<Configuration> confs = new ArrayList<Configuration>(otherNn.size());
+ List<Configuration> confs = new ArrayList<Configuration>(otherNodes.size());
myConf = new Configuration(myConf);
// unset independent properties
for (String idpKey : HA_SPECIAL_INDEPENDENT_KEYS) {
myConf.unset(idpKey);
}
- for (String nn : otherNn) {
+ for (String nn : otherNodes) {
Configuration confForOtherNode = new Configuration(myConf);
NameNode.initializeGenericKeys(confForOtherNode, nsId, nn);
confs.add(confForOtherNode);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org