Repository: hbase Updated Branches: refs/heads/branch-1.2 05cb05142 -> 95b0888f6
HBASE-14280 Bulk Upload from HA cluster to remote HA hbase cluster fails (Ankit Singhal) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/95b0888f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/95b0888f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/95b0888f Branch: refs/heads/branch-1.2 Commit: 95b0888f6905a2896287a0df257fc7fdc31d758e Parents: 05cb051 Author: tedyu <[email protected]> Authored: Tue Sep 22 09:22:31 2015 -0700 Committer: tedyu <[email protected]> Committed: Tue Sep 22 09:22:31 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/util/FSHDFSUtils.java | 25 ++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/95b0888f/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java index 1360fb2..a2b2935 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java @@ -27,6 +27,7 @@ import java.net.URI; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.Collection; import com.google.common.collect.Sets; import org.apache.commons.logging.Log; @@ -66,8 +67,17 @@ public class FSHDFSUtils extends FSUtils { dfsUtilClazz = Class.forName("org.apache.hadoop.hdfs.DFSUtil"); } if (getNNAddressesMethod == null) { - getNNAddressesMethod = - dfsUtilClazz.getMethod("getNNServiceRpcAddresses", Configuration.class); + try { + // getNNServiceRpcAddressesForCluster is available only in version + // equal to or later than Hadoop 2.6 + getNNAddressesMethod = + dfsUtilClazz.getMethod("getNNServiceRpcAddressesForCluster", Configuration.class); + } catch (NoSuchMethodException e) { + // If hadoop version is older than hadoop 2.6 + getNNAddressesMethod = + dfsUtilClazz.getMethod("getNNServiceRpcAddresses", Configuration.class); + } + } Map<String, Map<String, InetSocketAddress>> addressMap = @@ -115,6 +125,17 @@ public class FSHDFSUtils extends FSUtils { if (srcServiceName.equals(desServiceName)) { return true; } + if (srcServiceName.startsWith("ha-hdfs") && desServiceName.startsWith("ha-hdfs")) { + Collection<String> internalNameServices = + conf.getTrimmedStringCollection("dfs.internal.nameservices"); + if (!internalNameServices.isEmpty()) { + if (internalNameServices.contains(srcServiceName.split(":")[1])) { + return true; + } else { + return false; + } + } + } if (srcFs instanceof DistributedFileSystem && desFs instanceof DistributedFileSystem) { //If one serviceName is an HA format while the other is a non-HA format, // maybe they refer to the same FileSystem.
