Author: bikas
Date: Thu Jun 6 23:43:38 2013
New Revision: 1490473
URL: http://svn.apache.org/r1490473
Log:
Merge r1490470 from trunk to branch-2 for YARN-759. Create Command enum in
AllocateResponse (bikas)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java?rev=1490473&r1=1490472&r2=1490473&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java
Thu Jun 6 23:43:38 2013
@@ -116,14 +116,23 @@ public class LocalContainerAllocator ext
// continue to attempt to contact the RM.
throw e;
}
- if (allocateResponse.getResync()) {
- LOG.info("Event from RM: shutting down Application Master");
- // This can happen if the RM has been restarted. If it is in that state,
- // this application must clean itself up.
- eventHandler.handle(new JobEvent(this.getJob().getID(),
- JobEventType.JOB_AM_REBOOT));
- throw new YarnRuntimeException("Resource Manager doesn't recognize
AttemptId: " +
- this.getContext().getApplicationID());
+ if (allocateResponse.getAMCommand() != null) {
+ switch(allocateResponse.getAMCommand()) {
+ case AM_RESYNC:
+ case AM_SHUTDOWN:
+ LOG.info("Event from RM: shutting down Application Master");
+ // This can happen if the RM has been restarted. If it is in that
state,
+ // this application must clean itself up.
+ eventHandler.handle(new JobEvent(this.getJob().getID(),
+ JobEventType.JOB_AM_REBOOT));
+ throw new YarnRuntimeException("Resource Manager doesn't recognize
AttemptId: " +
+ this.getContext().getApplicationID());
+ default:
+ String msg =
+ "Unhandled value of AMCommand: " +
allocateResponse.getAMCommand();
+ LOG.error(msg);
+ throw new YarnRuntimeException(msg);
+ }
}
}
Modified:
hadoop/common/branches/branch-2/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/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1490473&r1=1490472&r2=1490473&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/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/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Thu Jun 6 23:43:38 2013
@@ -570,13 +570,22 @@ public class RMContainerAllocator extend
// continue to attempt to contact the RM.
throw e;
}
- if (response.getResync()) {
- // This can happen if the RM has been restarted. If it is in that state,
- // this application must clean itself up.
- eventHandler.handle(new JobEvent(this.getJob().getID(),
- JobEventType.JOB_AM_REBOOT));
- throw new YarnRuntimeException("Resource Manager doesn't recognize
AttemptId: " +
- this.getContext().getApplicationID());
+ if (response.getAMCommand() != null) {
+ switch(response.getAMCommand()) {
+ case AM_RESYNC:
+ case AM_SHUTDOWN:
+ // This can happen if the RM has been restarted. If it is in that
state,
+ // this application must clean itself up.
+ eventHandler.handle(new JobEvent(this.getJob().getID(),
+ JobEventType.JOB_AM_REBOOT));
+ throw new YarnRuntimeException("Resource Manager doesn't recognize
AttemptId: " +
+ this.getContext().getApplicationID());
+ default:
+ String msg =
+ "Unhandled value of AMCommand: " + response.getAMCommand();
+ LOG.error(msg);
+ throw new YarnRuntimeException(msg);
+ }
}
int newHeadRoom = getAvailableResources() != null ?
getAvailableResources().getMemory() : 0;
List<Container> newContainers = response.getAllocatedContainers();
