Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 41626 invoked from network); 16 Mar 2009 23:18:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Mar 2009 23:18:59 -0000 Received: (qmail 13297 invoked by uid 500); 16 Mar 2009 23:18:59 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 13109 invoked by uid 500); 16 Mar 2009 23:18:59 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 13100 invoked by uid 99); 16 Mar 2009 23:18:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2009 16:18:59 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 16 Mar 2009 23:18:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C09023888A0; Mon, 16 Mar 2009 23:18:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r755038 - in /hadoop/core/branches/branch-0.20: ./ CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/DFSClient.java src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java Date: Mon, 16 Mar 2009 23:18:31 -0000 To: core-commits@hadoop.apache.org From: hairong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090316231832.2C09023888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hairong Date: Mon Mar 16 23:18:31 2009 New Revision: 755038 URL: http://svn.apache.org/viewvc?rev=755038&view=rev Log: Merge -r 755034:755035 to move the change of HADOOP-5414 from main to branch 0.20. Modified: hadoop/core/branches/branch-0.20/ (props changed) hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed) hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java Propchange: hadoop/core/branches/branch-0.20/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 16 23:18:31 2009 @@ -1,2 +1,2 @@ /hadoop/core/branches/branch-0.19:713112 -/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927 +/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035 Modified: hadoop/core/branches/branch-0.20/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=755038&r1=755037&r2=755038&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.20/CHANGES.txt Mon Mar 16 23:18:31 2009 @@ -731,6 +731,10 @@ HADOOP-5505. Fix JspHelper initialization in the context of MiniDFSCluster. (Raghu Angadi) + HADOOP-5414. Fixes IO exception while executing hadoop fs -touchz fileName by + making sure that lease renewal thread exits before dfs client exits. + (hairong) + Release 0.19.2 - Unreleased BUG FIXES Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 16 23:18:31 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 -/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927 +/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035 Modified: hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=755038&r1=755037&r2=755038&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original) +++ hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Mon Mar 16 23:18:31 2009 @@ -208,6 +208,10 @@ if(clientRunning) { leasechecker.close(); clientRunning = false; + try { + leasechecker.interruptAndJoin(); + } catch (InterruptedException ie) { + } // close connections to the namenode RPC.stopProxy(rpcNamenode); @@ -975,9 +979,18 @@ pendingCreates.remove(src); } - synchronized void interrupt() { - if (daemon != null) { - daemon.interrupt(); + void interruptAndJoin() throws InterruptedException { + Daemon daemonCopy = null; + synchronized (this) { + if (daemon != null) { + daemon.interrupt(); + daemonCopy = daemon; + } + } + + if (daemonCopy != null) { + LOG.debug("Wait for lease checker to terminate"); + daemonCopy.join(); } } @@ -993,8 +1006,6 @@ } } } - - interrupt(); } private void renew() throws IOException { @@ -1012,7 +1023,7 @@ */ public void run() { long lastRenewed = 0; - while (clientRunning) { + while (clientRunning && !Thread.interrupted()) { if (System.currentTimeMillis() - lastRenewed > (LEASE_SOFTLIMIT_PERIOD / 2)) { try { renew(); Modified: hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java?rev=755038&r1=755037&r2=755038&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java (original) +++ hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java Mon Mar 16 23:18:31 2009 @@ -80,8 +80,8 @@ // sync file AppendTestUtil.LOG.info("sync"); stm.sync(); - AppendTestUtil.LOG.info("leasechecker.interrupt()"); - dfs.dfs.leasechecker.interrupt(); + AppendTestUtil.LOG.info("leasechecker.interruptAndJoin()"); + dfs.dfs.leasechecker.interruptAndJoin(); // set the soft limit to be 1 second so that the // namenode triggers lease recovery on next attempt to write-for-open.