Browse Source

HDFS-4448. Allow HA NN to start in secure mode with wildcard address configured (atm via asuresh)

(cherry picked from commit baf8bc6c488de170d2caf76d9fa4c99faaa8f1a6)
Arun Suresh 10 năm trước cách đây
mục cha
commit
889b92fa40

+ 3 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -143,6 +143,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-8218. Move classes that used by ClientProtocol into hdfs-client.
     (wheat9)
 
+    HDFS-4448. Allow HA NN to start in secure mode with wildcard address
+    configured (atm via asuresh)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

+ 1 - 8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java

@@ -1018,17 +1018,10 @@ public class DFSUtil {
    */
   @VisibleForTesting
   static String substituteForWildcardAddress(String configuredAddress,
-    String defaultHost) throws IOException {
+    String defaultHost) {
     InetSocketAddress sockAddr = NetUtils.createSocketAddr(configuredAddress);
-    InetSocketAddress defaultSockAddr = NetUtils.createSocketAddr(defaultHost
-        + ":0");
     final InetAddress addr = sockAddr.getAddress();
     if (addr != null && addr.isAnyLocalAddress()) {
-      if (UserGroupInformation.isSecurityEnabled() &&
-          defaultSockAddr.getAddress().isAnyLocalAddress()) {
-        throw new IOException("Cannot use a wildcard address with security. " +
-            "Must explicitly set bind address for Kerberos");
-      }
       return defaultHost + ":" + sockAddr.getPort();
     } else {
       return configuredAddress;