HDFS-4105. The SPNEGO user for secondary namenode should use the web keytab. Contributed by Arpit Gupta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1410693 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -315,6 +315,9 @@ Release 1.2.0 - unreleased
 
     HDFS-4180. Update TestFileCreation for HDFS-4122.  (Jing Zhao via szetszwo)
 
+    HDFS-4105. the SPNEGO user for secondary namenode should use the web 
+    keytab. (Arpit Gupta via jitendra)
+
 Release 1.1.1 - Unreleased
 
   INCOMPATIBLE CHANGES

src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

@@ -236,8 +236,12 @@ public class SecondaryNameNode implements Runnable {
                          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);
             }