HADOOP-9822. create constant MAX_CAPACITY in RetryCache rather than hard-coding 16 in RetryCache constructor. Contributed by Tsuyoshi Ozawa.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f269a0a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f269a0a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f269a0a Branch: refs/heads/yarn-2877 Commit: 5f269a0ad81bb6abc5242bf628f028ae6812f6b3 Parents: d36b6e0 Author: Haohui Mai <[email protected]> Authored: Mon Nov 23 13:22:20 2015 -0800 Committer: Haohui Mai <[email protected]> Committed: Mon Nov 23 13:22:20 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/ipc/RetryCache.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f269a0a/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9e106a7..c641a0e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1358,6 +1358,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11149. TestZKFailoverController times out. (Steve Loughran via ozawa) + HADOOP-9822. Create constant MAX_CAPACITY in RetryCache rather than + hard-coding 16 in RetryCache constructor. (Tsuyoshi Ozawa via wheat9) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f269a0a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java index d35ed95..7b85286 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java @@ -46,6 +46,7 @@ import com.google.common.base.Preconditions; public class RetryCache { public static final Log LOG = LogFactory.getLog(RetryCache.class); private final RetryCacheMetrics retryCacheMetrics; + private static final int MAX_CAPACITY = 16; /** * CacheEntry is tracked using unique client ID and callId of the RPC request @@ -194,7 +195,7 @@ public class RetryCache { */ public RetryCache(String cacheName, double percentage, long expirationTime) { int capacity = LightWeightGSet.computeCapacity(percentage, cacheName); - capacity = capacity > 16 ? capacity : 16; + capacity = capacity > MAX_CAPACITY ? capacity : MAX_CAPACITY; this.set = new LightWeightCache<CacheEntry, CacheEntry>(capacity, capacity, expirationTime, 0); this.expirationTime = expirationTime;
