You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by at...@apache.org on 2013/05/10 21:43:52 UTC
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
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;
/**
* <p>
@@ -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;