From 0880be20acd9c57872b511b46e23ba56a051751e Mon Sep 17 00:00:00 2001
From: Todd Lipcon <todd@apache.org>
Date: Fri, 12 Jul 2013 20:44:45 +0000
Subject: [PATCH] HDFS-4982. JournalNode should relogin from keytab before
 fetching logs from other JNs. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1502682 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                 | 3 +++
 .../org/apache/hadoop/hdfs/qjournal/server/Journal.java     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e752a07fb4b..75eb62f1295 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -270,6 +270,9 @@ Release 2.1.1-beta - UNRELEASED
 
   BUG FIXES
 
+    HDFS-4982. JournalNode should relogin from keytab before fetching logs
+    from other JNs (todd)
+
 Release 2.1.0-beta - 2013-07-02
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
index 75b5a708267..4e286b539a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
@@ -57,6 +57,7 @@
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.security.SecurityUtil;
+import org.apache.hadoop.security.UserGroupInformation;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
@@ -855,6 +856,11 @@ private File syncLog(RequestInfo reqInfo,
         new PrivilegedExceptionAction<Void>() {
           @Override
           public Void run() throws IOException {
+            // We may have lost our ticket since last checkpoint, log in again, just in case
+            if (UserGroupInformation.isSecurityEnabled()) {
+              UserGroupInformation.getCurrentUser().checkTGTAndReloginFromKeytab();
+            }
+
             boolean success = false;
             try {
               TransferFsImage.doGetUrl(url, localPaths, storage, true);