Jelajahi Sumber

Merge HADOOP-8882. Merge r1399102 from branch-1 to release 1.1.1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1407258 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 12 tahun lalu
induk
melakukan
d717cb2d65
2 mengubah file dengan 6 tambahan dan 1 penghapusan
  1. 3 0
      CHANGES.txt
  2. 3 1
      src/core/org/apache/hadoop/security/SecurityUtil.java

+ 3 - 0
CHANGES.txt

@@ -16,6 +16,9 @@ Release 1.1.1 - Unreleased
     webhdfs filesystem and fsck to fail when security is on.
     (Arpit Gupta via suresh)
 
+    HADOOP-8882. Uppercase namenode host name causes fsck to fail when 
+    useKsslAuth is on. (Arpit Gupta via suresh)
+
     HDFS-3791. HDFS-173 Backport - Namenode will not block until a large 
     directory deletion completes. It allows other operations when the 
     deletion is in progress. (umamahesh via suresh)

+ 3 - 1
src/core/org/apache/hadoop/security/SecurityUtil.java

@@ -43,6 +43,7 @@ import org.apache.hadoop.io.Text;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
+import org.apache.hadoop.security.authentication.util.KerberosUtil;
 import org.apache.hadoop.security.authorize.AccessControlList;
 import org.apache.hadoop.security.token.Token;
 
@@ -136,7 +137,8 @@ public class SecurityUtil {
     if(!UserGroupInformation.isSecurityEnabled())
       return;
     
-    String serviceName = "host/" + remoteHost.getHost();
+    String serviceName = KerberosUtil.getServicePrincipal("host",
+        remoteHost.getHost());
     if (LOG.isDebugEnabled())
       LOG.debug("Fetching service ticket for host at: " + serviceName);
     Object serviceCred = null;