MAPREDUCE-7302. Upgrading to JUnit 4.13 causes testcase TestFetcher.testCorruptedIFile() to fail. Contributed by Peter Bacsko. Reviewed by Akira Ajisaka.
This commit is contained in:
parent
d0c786db4d
commit
da93cd962c
@ -29,6 +29,7 @@
|
||||
|
||||
import static org.apache.hadoop.io.nativeio.NativeIO.POSIX.POSIX_FADV_WILLNEED;
|
||||
|
||||
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import org.slf4j.Logger;
|
||||
@ -59,7 +60,17 @@ public static ReadaheadPool getInstance() {
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@VisibleForTesting
|
||||
public static void resetInstance() {
|
||||
synchronized (ReadaheadPool.class) {
|
||||
if (instance != null) {
|
||||
instance.pool.shutdownNow();
|
||||
instance = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private ReadaheadPool() {
|
||||
pool = new ThreadPoolExecutor(POOL_SIZE, MAX_POOL_SIZE, 3L, TimeUnit.SECONDS,
|
||||
new ArrayBlockingQueue<Runnable>(CAPACITY));
|
||||
|
@ -46,6 +46,7 @@
|
||||
|
||||
import javax.crypto.SecretKey;
|
||||
|
||||
import org.apache.hadoop.io.ReadaheadPool;
|
||||
import org.apache.hadoop.io.Text;
|
||||
import org.apache.hadoop.mapred.Counters;
|
||||
import org.apache.hadoop.mapred.IFileInputStream;
|
||||
@ -92,6 +93,8 @@ public class TestFetcher {
|
||||
@SuppressWarnings("unchecked") // mocked generics
|
||||
public void setup() {
|
||||
LOG.info(">>>> " + name.getMethodName());
|
||||
// to avoid threading issues with JUnit 4.13+
|
||||
ReadaheadPool.resetInstance();
|
||||
job = new JobConf();
|
||||
job.setBoolean(MRJobConfig.SHUFFLE_FETCH_RETRY_ENABLED, false);
|
||||
jobWithRetry = new JobConf();
|
||||
|
Loading…
Reference in New Issue
Block a user