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

HBASE-14280 Revert due to TestFSHDFSUtils failure

This commit is contained in:
tedyu 2015-09-21 09:51:53 -07:00
parent 86cf148894
commit 54e8c4bf23
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
View File

@ -27,7 +27,6 @@ import java.net.URI;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Collection;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -67,17 +66,8 @@ public class FSHDFSUtils extends FSUtils {
dfsUtilClazz = Class.forName("org.apache.hadoop.hdfs.DFSUtil"); dfsUtilClazz = Class.forName("org.apache.hadoop.hdfs.DFSUtil");
} }
if (getNNAddressesMethod == null) { if (getNNAddressesMethod == null) {
try { getNNAddressesMethod =
// getNNServiceRpcAddressesForCluster is available only in version dfsUtilClazz.getMethod("getNNServiceRpcAddresses", Configuration.class);
// equal to or later than Hadoop 2.6
getNNAddressesMethod =
dfsUtilClazz.getMethod("getNNServiceRpcAddressesForCluster", Configuration.class);
} catch (NoSuchMethodError e) {
// If hadoop version is older than hadoop 2.6
getNNAddressesMethod =
dfsUtilClazz.getMethod("getNNServiceRpcAddresses", Configuration.class);
}
} }
Map<String, Map<String, InetSocketAddress>> addressMap = Map<String, Map<String, InetSocketAddress>> addressMap =
@ -125,17 +115,6 @@ public class FSHDFSUtils extends FSUtils {
if (srcServiceName.equals(desServiceName)) { if (srcServiceName.equals(desServiceName)) {
return true; 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 (srcFs instanceof DistributedFileSystem && desFs instanceof DistributedFileSystem) {
//If one serviceName is an HA format while the other is a non-HA format, //If one serviceName is an HA format while the other is a non-HA format,
// maybe they refer to the same FileSystem. // maybe they refer to the same FileSystem.