You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:08:57 UTC

svn commit: r1077377 - /hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

Author: omalley
Date: Fri Mar  4 04:08:57 2011
New Revision: 1077377

URL: http://svn.apache.org/viewvc?rev=1077377&view=rev
Log:
commit a070f8c83c512a31eb906e596727924fa8d30ed6
Author: Jakob Homan <jh...@yahoo-inc.com>
Date:   Fri Apr 9 15:31:59 2010 -0700

    HDFS:999 Secondary namenode should login using kerberos if security is
    configured.
    
    +++ b/YAHOO-CHANGES.txt
    +    HDFS-999.  Secondary namenode should login using kerberos if security
    +    is configured. Bugfix to original patch. (jhoman)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=1077377&r1=1077376&r2=1077377&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java Fri Mar  4 04:08:57 2011
@@ -309,6 +309,10 @@ public class SecondaryNameNode implement
         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();
@@ -413,9 +417,6 @@ public class SecondaryNameNode implement
                             "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