hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgho...@apache.org
Subject svn commit: r979817 - in /hadoop/hdfs/trunk: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Date Tue, 27 Jul 2010 19:19:14 GMT
Author: jghoman
Date: Tue Jul 27 19:19:14 2010
New Revision: 979817

URL: http://svn.apache.org/viewvc?rev=979817&view=rev
Log:
HDFS-1319. Fix location of re-login for secondary namenode from HDFS-999.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=979817&r1=979816&r2=979817&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Jul 27 19:19:14 2010
@@ -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
 

Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=979817&r1=979816&r2=979817&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
(original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Tue Jul 27 19:19:14 2010
@@ -294,6 +294,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();
@@ -410,9 +414,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
   



Mime
View raw message