HBASE-14280 Revert due to TestFSHDFSUtils failure
This commit is contained in:
parent
86cf148894
commit
54e8c4bf23
|
@ -27,7 +27,6 @@ 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;
|
||||
|
@ -67,17 +66,8 @@ public class FSHDFSUtils extends FSUtils {
|
|||
dfsUtilClazz = Class.forName("org.apache.hadoop.hdfs.DFSUtil");
|
||||
}
|
||||
if (getNNAddressesMethod == null) {
|
||||
try {
|
||||
// getNNServiceRpcAddressesForCluster is available only in version
|
||||
// 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);
|
||||
}
|
||||
|
||||
getNNAddressesMethod =
|
||||
dfsUtilClazz.getMethod("getNNServiceRpcAddresses", Configuration.class);
|
||||
}
|
||||
|
||||
Map<String, Map<String, InetSocketAddress>> addressMap =
|
||||
|
@ -125,17 +115,6 @@ 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.
|
||||
|
|
Loading…
Reference in New Issue