HDFS-1319. Fix location of re-login for secondary namenode from HDFS-999.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@979817 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -166,7 +166,10 @@ Trunk (unreleased changes)
     exception on the server side.  (szetszwo)
 
     HDFS-1308. job conf key for the services name of DelegationToken for HFTP
-     url is constructed incorrectly in HFTPFileSystem (boryas)
+    url is constructed incorrectly in HFTPFileSystem (boryas)
+
+    HDFS-1319. Fix location of re-login for secondary namenode from HDFS-999. 
+    (jghoman)
 
 Release 0.21.0 - Unreleased
 

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

@@ -294,6 +294,10 @@ public class SecondaryNameNode implements Runnable {
         break;
       }
       try {
+        // We may have lost our ticket since last checkpoint, log in again, just in case
+        if(UserGroupInformation.isSecurityEnabled())
+          UserGroupInformation.getCurrentUser().reloginFromKeytab();
+        
         long now = System.currentTimeMillis();
 
         long size = namenode.getEditLogSize();
@@ -410,9 +414,6 @@ public class SecondaryNameNode implements Runnable {
                             "after creating edits.new");
     }
 
-    // We may have lost our ticket since last checkpoint, log in again, just in case
-    if(UserGroupInformation.isSecurityEnabled())
-      UserGroupInformation.getCurrentUser().reloginFromKeytab();
     downloadCheckpointFiles(sig);   // Fetch fsimage and edits
     doMerge(sig);                   // Do the merge