hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jiten...@apache.org
Subject svn commit: r1410694 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Date Sat, 17 Nov 2012 04:00:02 GMT
Author: jitendra
Date: Sat Nov 17 04:00:01 2012
New Revision: 1410694

URL: http://svn.apache.org/viewvc?rev=1410694&view=rev
Log:
Merged r1410693 from branch-1 for HDFS-4105.

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1410694&r1=1410693&r2=1410694&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Sat Nov 17 04:00:01 2012
@@ -48,6 +48,8 @@ Release 1.1.1 - Unreleased
     HADOOP-9017. Fix hadoop-client-pom-template.xml and
     hadoop-client-pom-template.xml for version token ( gkesavan )
 
+    HDFS-4105. the SPNEGO user for secondary namenode should use the web 
+    keytab. (Arpit Gupta via jitendra)
 
 Release 1.1.0 - 2012.09.28
 

Propchange: hadoop/common/branches/branch-1.1/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1410693

Modified: hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=1410694&r1=1410693&r2=1410694&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
(original)
+++ hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Sat Nov 17 04:00:01 2012
@@ -224,8 +224,12 @@ public class SecondaryNameNode implement
                          SecurityUtil.getServerPrincipal
                            (principalInConf, infoSocAddr.getHostName()));
             }
-            String httpKeytab = 
-              conf.get(DFSConfigKeys.DFS_SECONDARY_NAMENODE_KEYTAB_FILE_KEY);
+            String httpKeytab = conf.get(
+                DFSConfigKeys.DFS_WEB_AUTHENTICATION_KERBEROS_KEYTAB_KEY);
+            if (null == httpKeytab) {
+              httpKeytab = conf.get(
+                  DFSConfigKeys.DFS_SECONDARY_NAMENODE_KEYTAB_FILE_KEY);
+            }
             if (httpKeytab != null && !httpKeytab.isEmpty()) {
               params.put("kerberos.keytab", httpKeytab);
             }



Mime
View raw message