MAPREDUCE-7268. Fix TestMapreduceConfigFields (#1935)

(cherry picked from commit f8e598f278)
This commit is contained in:
Wanqiang Ji 2020-04-03 09:59:07 +08:00 committed by Akira Ajisaka
parent a2f4dcb470
commit 215a62e99f
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50

View File

@ -153,6 +153,18 @@ public class ShuffleHandler extends AuxiliaryService {
public static final String SHUFFLE_READAHEAD_BYTES = "mapreduce.shuffle.readahead.bytes"; public static final String SHUFFLE_READAHEAD_BYTES = "mapreduce.shuffle.readahead.bytes";
public static final int DEFAULT_SHUFFLE_READAHEAD_BYTES = 4 * 1024 * 1024; public static final int DEFAULT_SHUFFLE_READAHEAD_BYTES = 4 * 1024 * 1024;
public static final String MAX_WEIGHT =
"mapreduce.shuffle.pathcache.max-weight";
public static final int DEFAULT_MAX_WEIGHT = 10 * 1024 * 1024;
public static final String EXPIRE_AFTER_ACCESS_MINUTES =
"mapreduce.shuffle.pathcache.expire-after-access-minutes";
public static final int DEFAULT_EXPIRE_AFTER_ACCESS_MINUTES = 5;
public static final String CONCURRENCY_LEVEL =
"mapreduce.shuffle.pathcache.concurrency-level";
public static final int DEFAULT_CONCURRENCY_LEVEL = 16;
// pattern to identify errors related to the client closing the socket early // pattern to identify errors related to the client closing the socket early
// idea borrowed from Netty SslHandler // idea borrowed from Netty SslHandler
@ -837,18 +849,6 @@ public ChannelPipeline getPipeline() throws Exception {
} }
class Shuffle extends SimpleChannelUpstreamHandler { class Shuffle extends SimpleChannelUpstreamHandler {
private static final String MAX_WEIGHT =
"mapreduce.shuffle.pathcache.max-weight";
private static final int DEFAULT_MAX_WEIGHT = 10 * 1024 * 1024;
private static final String EXPIRE_AFTER_ACCESS_MINUTES =
"mapreduce.shuffle.pathcache.expire-after-access-minutes";
private static final int DEFAULT_EXPIRE_AFTER_ACCESS_MINUTES = 5;
private static final String CONCURRENCY_LEVEL =
"mapreduce.shuffle.pathcache.concurrency-level";
private static final int DEFAULT_CONCURRENCY_LEVEL = 16;
private final IndexCache indexCache; private final IndexCache indexCache;
private final private final
LoadingCache<AttemptPathIdentifier, AttemptPathInfo> pathCache; LoadingCache<AttemptPathIdentifier, AttemptPathInfo> pathCache;