From 215a62e99f71b612a00532ef50975d5e7226e7e7 Mon Sep 17 00:00:00 2001 From: Wanqiang Ji Date: Fri, 3 Apr 2020 09:59:07 +0800 Subject: [PATCH] MAPREDUCE-7268. Fix TestMapreduceConfigFields (#1935) (cherry picked from commit f8e598f2785072e49594cd84e821733c99530940) --- .../apache/hadoop/mapred/ShuffleHandler.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java index ffc65641a5..1ffb93300b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java @@ -153,6 +153,18 @@ public class ShuffleHandler extends AuxiliaryService { 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 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 // idea borrowed from Netty SslHandler @@ -837,18 +849,6 @@ public ChannelPipeline getPipeline() throws Exception { } 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 LoadingCache pathCache;