Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9509F11EB3 for ; Fri, 10 May 2013 19:44:16 +0000 (UTC) Received: (qmail 17895 invoked by uid 500); 10 May 2013 19:44:16 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 17861 invoked by uid 500); 10 May 2013 19:44:16 -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 17848 invoked by uid 99); 10 May 2013 19:44:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2013 19:44:16 +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; Fri, 10 May 2013 19:44:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5305D23888FD; Fri, 10 May 2013 19:43:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1481160 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java Date: Fri, 10 May 2013 19:43:52 -0000 To: hdfs-commits@hadoop.apache.org From: atm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130510194352.5305D23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: atm Date: Fri May 10 19:43:48 2013 New Revision: 1481160 URL: http://svn.apache.org/r1481160 Log: HDFS-4751. TestLeaseRenewer#testThreadName flakes. Contributed by Andrew Wang. Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1481160&r1=1481159&r2=1481160&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri May 10 19:43:48 2013 @@ -984,6 +984,8 @@ Release 2.0.5-beta - UNRELEASED HDFS-4799. Corrupt replica can be prematurely removed from corruptReplicas map. (todd via kihwal) + HDFS-4751. TestLeaseRenewer#testThreadName flakes. (Andrew Wang via atm) + Release 2.0.4-alpha - 2013-04-25 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java?rev=1481160&r1=1481159&r2=1481160&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java Fri May 10 19:43:48 2013 @@ -35,6 +35,7 @@ import org.apache.hadoop.security.UserGr import org.apache.hadoop.util.Daemon; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Time; +import com.google.common.annotations.VisibleForTesting; /** *

@@ -323,6 +324,11 @@ class LeaseRenewer { } } + @VisibleForTesting + synchronized void setEmptyTime(long time) { + emptyTime = time; + } + /** Close a file. */ void closeFile(final String src, final DFSClient dfsc) { dfsc.removeFileBeingWritten(src); Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java?rev=1481160&r1=1481159&r2=1481160&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java Fri May 10 19:43:48 2013 @@ -182,8 +182,6 @@ public class TestLeaseRenewer { renewer.isRunning()); // Pretend to open a file - Mockito.doReturn(false) - .when(MOCK_DFSCLIENT).isFilesBeingWrittenEmpty(); renewer.put(filePath, mockStream, MOCK_DFSCLIENT); Assert.assertTrue("Renewer should have started running", @@ -194,9 +192,8 @@ public class TestLeaseRenewer { Assert.assertEquals("LeaseRenewer:myuser@hdfs://nn1/", threadName); // Pretend to close the file - Mockito.doReturn(true) - .when(MOCK_DFSCLIENT).isFilesBeingWrittenEmpty(); renewer.closeFile(filePath, MOCK_DFSCLIENT); + renewer.setEmptyTime(Time.now()); // Should stop the renewer running within a few seconds long failTime = Time.now() + 5000;