Author: acmurthy
Date: Fri Jul 5 03:24:10 2013
New Revision: 1499907
URL: http://svn.apache.org/r1499907
Log:
Merge -c 1499906 from branch-1 to branch-1.2 to fix MAPREDUCE-5368. Reduce
memory footprint of JobTracker by using non-default values for hash-tables to
store Locality and Avataar for TaskAttempts. Contributed by zhaoyunjiong.
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1499907&r1=1499906&r2=1499907&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Fri Jul 5 03:24:10 2013
@@ -49,6 +49,10 @@ Release 1.2.1 - Unreleased
MAPREDUCE-5375. Use short name for renewing delegation tokens. (Venkat
Ranganathan via acmurthy)
+ MAPREDUCE-5368. Reduce memory footprint of JobTracker by using non-default
+ values for hash-tables to store Locality and Avataar for TaskAttempts.
+ (zhaoyunjiong via acmurthy)
+
Release 1.2.0 - 2013.05.05
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java?rev=1499907&r1=1499906&r2=1499907&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
(original)
+++
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
Fri Jul 5 03:24:10 2013
@@ -131,9 +131,9 @@ class TaskInProgress {
private String user;
private Map<TaskAttemptID, Locality> taskLocality =
- new ConcurrentHashMap<TaskAttemptID, Locality>();
+ new ConcurrentHashMap<TaskAttemptID, Locality>(4, 0.75f, 2);
private Map<TaskAttemptID, Avataar> taskAvataar =
- new ConcurrentHashMap<TaskAttemptID, Avataar>();
+ new ConcurrentHashMap<TaskAttemptID, Avataar>(4, 0.75f, 2);
/**
* Constructor for MapTask
