From b8ad6c85a549a6f17cf6675e58ef002d84059d3c Mon Sep 17 00:00:00 2001 From: Chen Liang Date: Wed, 12 Dec 2018 10:39:39 -0800 Subject: [PATCH] HDFS-14142. Move ipfailover config key out of HdfsClientConfigKeys. Contributed by Chen Liang. --- .../apache/hadoop/hdfs/client/HdfsClientConfigKeys.java | 3 --- .../ha/ObserverReadProxyProviderWithIPFailover.java | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java index f26ce209d7..9d20933705 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java @@ -192,9 +192,6 @@ public interface HdfsClientConfigKeys { String DFS_PROVIDED_ALIASMAP_INMEMORY_RPC_ADDRESS = "dfs.provided.aliasmap.inmemory.dnrpc-address"; - String DFS_CLIENT_FAILOVER_IPFAILOVER_VIRTUAL_ADDRESS = - Failover.PREFIX + "ipfailover.virtual-address"; - /** * These are deprecated config keys to client code. */ diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProviderWithIPFailover.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProviderWithIPFailover.java index 22f6dd3638..fc12386021 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProviderWithIPFailover.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProviderWithIPFailover.java @@ -22,13 +22,12 @@ import java.util.Collections; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys; import org.apache.hadoop.hdfs.HAUtilClient; import org.apache.hadoop.hdfs.protocol.ClientProtocol; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_CLIENT_FAILOVER_IPFAILOVER_VIRTUAL_ADDRESS; - /** * Extends {@link ObserverReadProxyProvider} to support NameNode IP failover. * @@ -81,6 +80,9 @@ public class ObserverReadProxyProviderWithIPFailover private static final Logger LOG = LoggerFactory.getLogger( ObserverReadProxyProviderWithIPFailover.class); + private static final String IPFAILOVER_CONFIG_PREFIX = + HdfsClientConfigKeys.Failover.PREFIX + "ipfailover.virtual-address"; + /** * By default ObserverReadProxyProviderWithIPFailover * uses {@link IPFailoverProxyProvider} for failover. @@ -123,8 +125,7 @@ private void cloneDelegationTokenForVirtualIP( private static URI getFailoverVirtualIP( Configuration conf, String nameServiceID) { - String configKey = DFS_CLIENT_FAILOVER_IPFAILOVER_VIRTUAL_ADDRESS - + "." + nameServiceID; + String configKey = IPFAILOVER_CONFIG_PREFIX + "." + nameServiceID; String virtualIP = conf.get(configKey); LOG.info("Name service ID {} will use virtual IP {} for failover", nameServiceID, virtualIP);