You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2013/07/19 02:58:34 UTC
svn commit: r1504736 - in
/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/
main/java/org/apache/hadoop/mapreduce/v2/app/rm/ test/java/...
Author: acmurthy
Date: Fri Jul 19 00:58:33 2013
New Revision: 1504736
URL: http://svn.apache.org/r1504736
Log:
Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V.
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/RMCommunicator.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
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/RMContainerRequestor.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.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=1504736&r1=1504735&r2=1504736&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 Fri Jul 19 00:58:33 2013
@@ -93,9 +93,9 @@ public class LocalContainerAllocator ext
@SuppressWarnings("unchecked")
@Override
protected synchronized void heartbeat() throws Exception {
- AllocateRequest allocateRequest = AllocateRequest.newInstance(
- this.applicationAttemptId, this.lastResponseID, super
- .getApplicationProgress(), new ArrayList<ResourceRequest>(),
+ AllocateRequest allocateRequest =
+ AllocateRequest.newInstance(this.lastResponseID,
+ super.getApplicationProgress(), new ArrayList<ResourceRequest>(),
new ArrayList<ContainerId>(), null);
AllocateResponse allocateResponse;
try {
@@ -143,7 +143,7 @@ public class LocalContainerAllocator ext
LOG.info("Processing the event " + event.toString());
// Assign the same container ID as the AM
ContainerId cID =
- ContainerId.newInstance(applicationAttemptId,
+ ContainerId.newInstance(getContext().getApplicationAttemptId(),
this.containerId.getId());
Container container = recordFactory.newRecordInstance(Container.class);
container.setId(cID);
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/RMCommunicator.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/RMCommunicator.java?rev=1504736&r1=1504735&r2=1504736&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/RMCommunicator.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/RMCommunicator.java Fri Jul 19 00:58:33 2013
@@ -45,7 +45,6 @@ import org.apache.hadoop.yarn.api.protoc
import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest;
import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
import org.apache.hadoop.yarn.api.records.Resource;
@@ -63,7 +62,6 @@ public abstract class RMCommunicator ext
private static final Log LOG = LogFactory.getLog(RMContainerAllocator.class);
private int rmPollInterval;//millis
protected ApplicationId applicationId;
- protected ApplicationAttemptId applicationAttemptId;
private final AtomicBoolean stopped;
protected Thread allocatorThread;
@SuppressWarnings("rawtypes")
@@ -91,7 +89,6 @@ public abstract class RMCommunicator ext
this.context = context;
this.eventHandler = context.getEventHandler();
this.applicationId = context.getApplicationID();
- this.applicationAttemptId = context.getApplicationAttemptId();
this.stopped = new AtomicBoolean(false);
this.heartbeatCallbacks = new ConcurrentLinkedQueue<Runnable>();
}
@@ -142,7 +139,6 @@ public abstract class RMCommunicator ext
try {
RegisterApplicationMasterRequest request =
recordFactory.newRecordInstance(RegisterApplicationMasterRequest.class);
- request.setApplicationAttemptId(applicationAttemptId);
if (serviceAddr != null) {
request.setHost(serviceAddr.getHostName());
request.setRpcPort(serviceAddr.getPort());
@@ -193,11 +189,8 @@ public abstract class RMCommunicator ext
LOG.info("History url is " + historyUrl);
FinishApplicationMasterRequest request =
- recordFactory.newRecordInstance(FinishApplicationMasterRequest.class);
- request.setAppAttemptId(this.applicationAttemptId);
- request.setFinalApplicationStatus(finishState);
- request.setDiagnostics(sb.toString());
- request.setTrackingUrl(historyUrl);
+ FinishApplicationMasterRequest.newInstance(finishState,
+ sb.toString(), historyUrl);
scheduler.finishApplicationMaster(request);
} catch(Exception are) {
LOG.error("Exception while unregistering ", are);
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=1504736&r1=1504735&r2=1504736&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 Fri Jul 19 00:58:33 2013
@@ -1160,14 +1160,6 @@ public class RMContainerAllocator extend
TaskAttemptId get(ContainerId cId) {
return containerToAttemptMap.get(cId);
}
-
- NodeId getNodeId(TaskAttemptId tId) {
- if (tId.getTaskId().getTaskType().equals(TaskType.MAP)) {
- return maps.get(tId).getNodeId();
- } else {
- return reduces.get(tId).getNodeId();
- }
- }
ContainerId get(TaskAttemptId tId) {
Container taskContainer;
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/RMContainerRequestor.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/RMContainerRequestor.java?rev=1504736&r1=1504735&r2=1504736&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/RMContainerRequestor.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/RMContainerRequestor.java Fri Jul 19 00:58:33 2013
@@ -145,10 +145,10 @@ public abstract class RMContainerRequest
}
protected AllocateResponse makeRemoteRequest() throws IOException {
- AllocateRequest allocateRequest = AllocateRequest.newInstance(
- applicationAttemptId, lastResponseID, super.getApplicationProgress(),
- new ArrayList<ResourceRequest>(ask), new ArrayList<ContainerId>(
- release), null);
+ AllocateRequest allocateRequest =
+ AllocateRequest.newInstance(lastResponseID,
+ super.getApplicationProgress(), new ArrayList<ResourceRequest>(ask),
+ new ArrayList<ContainerId>(release), null);
AllocateResponse allocateResponse;
try {
allocateResponse = scheduler.allocate(allocateRequest);
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java?rev=1504736&r1=1504735&r2=1504736&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java Fri Jul 19 00:58:33 2013
@@ -234,7 +234,7 @@ public class MRAppBenchmark {
for (int i = 0; i < numContainers; i++) {
ContainerId containerId =
ContainerId.newInstance(
- request.getApplicationAttemptId(),
+ getContext().getApplicationAttemptId(),
request.getResponseId() + i);
containers.add(Container.newInstance(containerId,
NodeId.newInstance("host" + containerId.getId(), 2345),