Author: tucu
Date: Fri Jun 14 19:06:50 2013
New Revision: 1493207
URL: http://svn.apache.org/r1493207
Log:
MAPREDUCE-5310. MRAM should not normalize allocation request capabilities.
(tucu)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1493207&r1=1493206&r2=1493207&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Jun 14
19:06:50 2013
@@ -557,6 +557,9 @@ Release 2.1.0-beta - UNRELEASED
MAPREDUCE-5319. Set user.name in job.xml. (Xuan Gong via acmurthy)
+ MAPREDUCE-5310. MRAM should not normalize allocation request capabilities.
+ (tucu)
+
Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java?rev=1493207&r1=1493206&r2=1493207&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
Fri Jun 14 19:06:50 2013
@@ -72,7 +72,6 @@ public abstract class RMCommunicator ext
protected AMRMProtocol scheduler;
private final ClientService clientService;
protected int lastResponseID;
- private Resource minContainerCapability;
private Resource maxContainerCapability;
protected Map<ApplicationAccessType, String> applicationACLs;
private volatile long lastHeartbeatTime;
@@ -152,14 +151,10 @@ public abstract class RMCommunicator ext
}
RegisterApplicationMasterResponse response =
scheduler.registerApplicationMaster(request);
- minContainerCapability = response.getMinimumResourceCapability();
maxContainerCapability = response.getMaximumResourceCapability();
- this.context.getClusterInfo().setMinContainerCapability(
- minContainerCapability);
this.context.getClusterInfo().setMaxContainerCapability(
maxContainerCapability);
this.applicationACLs = response.getApplicationACLs();
- LOG.info("minContainerCapability: " +
minContainerCapability.getMemory());
LOG.info("maxContainerCapability: " +
maxContainerCapability.getMemory());
} catch (Exception are) {
LOG.error("Exception while registering", are);
@@ -202,10 +197,6 @@ public abstract class RMCommunicator ext
}
}
- protected Resource getMinContainerCapability() {
- return minContainerCapability;
- }
-
protected Resource getMaxContainerCapability() {
return maxContainerCapability;
}
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1493207&r1=1493206&r2=1493207&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Fri Jun 14 19:06:50 2013
@@ -291,9 +291,6 @@ public class RMContainerAllocator extend
if
(reqEvent.getAttemptID().getTaskId().getTaskType().equals(TaskType.MAP)) {
if (mapResourceReqt == 0) {
mapResourceReqt = reqEvent.getCapability().getMemory();
- int minSlotMemSize = getMinContainerCapability().getMemory();
- mapResourceReqt = (int) Math.ceil((float)
mapResourceReqt/minSlotMemSize)
- * minSlotMemSize;
eventHandler.handle(new JobHistoryEvent(jobId,
new
NormalizedResourceEvent(org.apache.hadoop.mapreduce.TaskType.MAP,
mapResourceReqt)));
@@ -314,10 +311,6 @@ public class RMContainerAllocator extend
} else {
if (reduceResourceReqt == 0) {
reduceResourceReqt = reqEvent.getCapability().getMemory();
- int minSlotMemSize = getMinContainerCapability().getMemory();
- //round off on slotsize
- reduceResourceReqt = (int) Math.ceil((float)
- reduceResourceReqt/minSlotMemSize) * minSlotMemSize;
eventHandler.handle(new JobHistoryEvent(jobId,
new NormalizedResourceEvent(
org.apache.hadoop.mapreduce.TaskType.REDUCE,
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java?rev=1493207&r1=1493206&r2=1493207&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
Fri Jun 14 19:06:50 2013
@@ -1402,11 +1402,6 @@ public class TestRMContainerAllocator {
}
@Override
- protected Resource getMinContainerCapability() {
- return Resource.newInstance(1024, 1);
- }
-
- @Override
protected Resource getMaxContainerCapability() {
return Resource.newInstance(10240, 1);
}
