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 aa...@apache.org on 2020/04/03 01:59:24 UTC
[hadoop] branch trunk updated: MAPREDUCE-7268. Fix
TestMapreduceConfigFields (#1935)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f8e598f MAPREDUCE-7268. Fix TestMapreduceConfigFields (#1935)
f8e598f is described below
commit f8e598f2785072e49594cd84e821733c99530940
Author: Wanqiang Ji <wa...@gmail.com>
AuthorDate: Fri Apr 3 09:59:07 2020 +0800
MAPREDUCE-7268. Fix TestMapreduceConfigFields (#1935)
---
.../org/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 ffc6564..1ffb933 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 class ShuffleHandler extends AuxiliaryService {
}
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<AttemptPathIdentifier, AttemptPathInfo> pathCache;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org