Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11630. TestThrottledAsyncCheckerTimeout fails intermittently in Jenkins builds. Contributed by Hanisha Koneru.

Browse Source
This commit is contained in:
Hanisha Koneru 2017-04-12 17:11:36 -07:00 committed by Arpit Agarwal
parent ed8bb51f59
commit 107f685f64
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/checker/TestDatasetVolumeCheckerTimeout.java
View File

@ -92,7 +92,7 @@ public VolumeCheckResult answer(
return volume; return volume;
} }
@Test (timeout = 1000) @Test (timeout = 300000)
public void testDiskCheckTimeout() throws Exception { public void testDiskCheckTimeout() throws Exception {
LOG.info("Executing {}", testName.getMethodName()); LOG.info("Executing {}", testName.getMethodName());
final FsVolumeSpi volume = makeSlowVolume(); final FsVolumeSpi volume = makeSlowVolume();

42
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/checker/TestThrottledAsyncCheckerTimeout.java
View File

@ -17,6 +17,13 @@
*/ */
package org.apache.hadoop.hdfs.server.datanode.checker; package org.apache.hadoop.hdfs.server.datanode.checker;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
@ -35,10 +42,7 @@
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TestName; import org.junit.rules.TestName;
import static org.mockito.Matchers.*; import org.junit.rules.Timeout;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Set; import java.util.Set;
@ -56,10 +60,10 @@ public class TestThrottledAsyncCheckerTimeout {
@Rule @Rule
public TestName testName = new TestName(); public TestName testName = new TestName();
@Rule
public Timeout testTimeout = new Timeout(300_000);
Configuration conf;
private static final long DISK_CHECK_TIMEOUT = 10; private static final long DISK_CHECK_TIMEOUT = 10;
private static final long DISK_CHECK_TIME = 100;
private ReentrantLock lock; private ReentrantLock lock;
private ExecutorService getExecutorService() { private ExecutorService getExecutorService() {
@ -71,7 +75,7 @@ public void initializeLock() {
lock = new ReentrantLock(); lock = new ReentrantLock();
} }
@Test (timeout = 1000) @Test
public void testDiskCheckTimeout() throws Exception { public void testDiskCheckTimeout() throws Exception {
LOG.info("Executing {}", testName.getMethodName()); LOG.info("Executing {}", testName.getMethodName());
@ -121,7 +125,7 @@ public void onFailure(Throwable t) {
assertTrue(throwable[0] instanceof TimeoutException); assertTrue(throwable[0] instanceof TimeoutException);
} }
@Test (timeout = 2000) @Test
public void testDiskCheckTimeoutInvokesOneCallbackOnly() throws Exception { public void testDiskCheckTimeoutInvokesOneCallbackOnly() throws Exception {
LOG.info("Executing {}", testName.getMethodName()); LOG.info("Executing {}", testName.getMethodName());
@ -141,13 +145,12 @@ public void testDiskCheckTimeoutInvokesOneCallbackOnly() throws Exception {
assertTrue(olf1.isPresent()); assertTrue(olf1.isPresent());
Futures.addCallback(olf1.get(), futureCallback); Futures.addCallback(olf1.get(), futureCallback);
// Wait for the callback
Thread.sleep(DISK_CHECK_TIMEOUT);
// Verify that timeout results in only 1 onFailure call and 0 onSuccess // Verify that timeout results in only 1 onFailure call and 0 onSuccess
// calls. // calls.
verify(futureCallback, times(1)).onFailure(any(Throwable.class)); verify(futureCallback, timeout((int) DISK_CHECK_TIMEOUT*10).times(1))
verify(futureCallback, times(0)).onSuccess(anyBoolean()); .onFailure(any(Throwable.class));
verify(futureCallback, timeout((int) DISK_CHECK_TIMEOUT*10).times(0))
.onSuccess(anyBoolean());
// Release lock so that target can acquire it. // Release lock so that target can acquire it.
lock.unlock(); lock.unlock();
@ -158,16 +161,15 @@ public void testDiskCheckTimeoutInvokesOneCallbackOnly() throws Exception {
assertTrue(olf2.isPresent()); assertTrue(olf2.isPresent());
Futures.addCallback(olf2.get(), futureCallback); Futures.addCallback(olf2.get(), futureCallback);
// Wait for the callback
Thread.sleep(DISK_CHECK_TIME);
// Verify that normal check (dummy) results in only 1 onSuccess call. // Verify that normal check (dummy) results in only 1 onSuccess call.
// Number of times onFailure is invoked should remain the same - 1. // Number of times onFailure is invoked should remain the same i.e. 1.
verify(futureCallback, times(1)).onFailure(any(Throwable.class)); verify(futureCallback, timeout((int) DISK_CHECK_TIMEOUT*10).times(1))
verify(futureCallback, times(1)).onSuccess(anyBoolean()); .onFailure(any(Throwable.class));
verify(futureCallback, timeout((int) DISK_CHECK_TIMEOUT*10).times(1))
.onSuccess(anyBoolean());
} }
@Test (timeout = 1000) @Test
public void testTimeoutExceptionIsNotThrownForGoodDisk() throws Exception { public void testTimeoutExceptionIsNotThrownForGoodDisk() throws Exception {
LOG.info("Executing {}", testName.getMethodName()); LOG.info("Executing {}", testName.getMethodName());