Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 252 invoked from network); 6 Apr 2011 06:22:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Apr 2011 06:22:50 -0000 Received: (qmail 26779 invoked by uid 500); 6 Apr 2011 06:22:50 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 26755 invoked by uid 500); 6 Apr 2011 06:22:50 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 26747 invoked by uid 99); 6 Apr 2011 06:22:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2011 06:22:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2011 06:22:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D93E723889E2; Wed, 6 Apr 2011 06:22:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1089314 - in /hadoop/hdfs/branches/yahoo-merge: CHANGES.txt src/java/org/apache/hadoop/hdfs/HftpFileSystem.java Date: Wed, 06 Apr 2011 06:22:26 -0000 To: hdfs-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110406062226.D93E723889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Wed Apr 6 06:22:26 2011 New Revision: 1089314 URL: http://svn.apache.org/viewvc?rev=1089314&view=rev Log: commit 6684168c5f0eaefde00c5a30e3a5cfe14d69266b Author: Owen O'Malley Date: Tue Apr 5 11:34:11 2011 -0700 HDFS-1656. Fixes an issue to do with fetching of delegation tokens in HftpFileSystem. Contributed by Kan Zhang. Conflicts: YAHOO-CHANGES.txt Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/CHANGES.txt?rev=1089314&r1=1089313&r2=1089314&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/CHANGES.txt (original) +++ hadoop/hdfs/branches/yahoo-merge/CHANGES.txt Wed Apr 6 06:22:26 2011 @@ -244,7 +244,10 @@ Trunk (unreleased changes) HDFS-1684. Balancer cannot start with with multiple namenodes. (szetszwo) - HDFS-1445: Fast Snapshot via batch hardlinks. (Matt Foley) + HDFS-1445. Fast Snapshot via batch hardlinks. (Matt Foley) + + HDFS-1656. Fixes an issue to do with fetching of delegation tokens in + HftpFileSystem. (Kan Zhang via ddas) Release 0.22.0 - Unreleased Modified: hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1089314&r1=1089313&r2=1089314&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java (original) +++ hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java Wed Apr 6 06:22:26 2011 @@ -179,9 +179,6 @@ public class HftpFileSystem extends File } } - //Renew TGT if needed - ugi.reloginFromKeytab(); - //since we don't already have a token, go get one over https if (delegationToken == null) { delegationToken = @@ -193,8 +190,10 @@ public class HftpFileSystem extends File @Override - public Token getDelegationToken(final String renewer) throws IOException { + public synchronized Token getDelegationToken(final String renewer) throws IOException { try { + //Renew TGT if needed + ugi.reloginFromKeytab(); return ugi.doAs(new PrivilegedExceptionAction>() { public Token run() throws IOException { Credentials c;