You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by iw...@apache.org on 2020/05/22 12:36:36 UTC
[hadoop] branch branch-3.2 updated: HADOOP-17040. Fix intermittent
failure of ITestBlockingThreadPoolExecutorService. (#2020)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 77e69a7 HADOOP-17040. Fix intermittent failure of ITestBlockingThreadPoolExecutorService. (#2020)
77e69a7 is described below
commit 77e69a73dac92766beebee1eda0a7cba65ef0c36
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Fri May 22 18:50:19 2020 +0900
HADOOP-17040. Fix intermittent failure of ITestBlockingThreadPoolExecutorService. (#2020)
(cherry picked from commit 968531463375ebf29ba3186c13b5f8685df10d25)
---
.../ITestBlockingThreadPoolExecutorService.java | 37 ++++++++++++++--------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestBlockingThreadPoolExecutorService.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestBlockingThreadPoolExecutorService.java
index 3dfe286..569f6fb 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestBlockingThreadPoolExecutorService.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestBlockingThreadPoolExecutorService.java
@@ -31,11 +31,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
/**
* Basic test for S3A's blocking executor service.
@@ -92,11 +92,12 @@ public class ITestBlockingThreadPoolExecutorService {
*/
protected void verifyQueueSize(ExecutorService executorService,
int expectedQueueSize) {
- StopWatch stopWatch = new StopWatch().start();
+ CountDownLatch latch = new CountDownLatch(1);
for (int i = 0; i < expectedQueueSize; i++) {
- executorService.submit(sleeper);
- assertDidntBlock(stopWatch);
+ executorService.submit(new LatchedSleeper(latch));
}
+ StopWatch stopWatch = new StopWatch().start();
+ latch.countDown();
executorService.submit(sleeper);
assertDidBlock(stopWatch);
}
@@ -124,15 +125,6 @@ public class ITestBlockingThreadPoolExecutorService {
// Helper functions, etc.
- private void assertDidntBlock(StopWatch sw) {
- try {
- assertFalse("Non-blocking call took too long.",
- sw.now(TimeUnit.MILLISECONDS) > BLOCKING_THRESHOLD_MSEC);
- } finally {
- sw.reset().start();
- }
- }
-
private void assertDidBlock(StopWatch sw) {
try {
if (sw.now(TimeUnit.MILLISECONDS) < BLOCKING_THRESHOLD_MSEC) {
@@ -164,6 +156,25 @@ public class ITestBlockingThreadPoolExecutorService {
}
};
+ private class LatchedSleeper implements Runnable {
+ private final CountDownLatch latch;
+
+ LatchedSleeper(CountDownLatch latch) {
+ this.latch = latch;
+ }
+
+ @Override
+ public void run() {
+ try {
+ latch.await();
+ Thread.sleep(TASK_SLEEP_MSEC);
+ } catch (InterruptedException e) {
+ LOG.info("Thread {} interrupted.", Thread.currentThread().getName());
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
/**
* Helper function to create thread pool under test.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org