Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in FinishApplicationMasterRequest for consistency. Contributed by Jian He. 

svn merge --ignore-ancestry -c 1493315 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493316 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-06-15 04:58:45 +00:00
parent 2d8999dc35
commit dc8d2412fe
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
View File

@ -188,7 +188,7 @@ public abstract class RMCommunicator extends AbstractService
FinishApplicationMasterRequest request = FinishApplicationMasterRequest request =
recordFactory.newRecordInstance(FinishApplicationMasterRequest.class); recordFactory.newRecordInstance(FinishApplicationMasterRequest.class);
request.setAppAttemptId(this.applicationAttemptId); request.setAppAttemptId(this.applicationAttemptId);
request.setFinishApplicationStatus(finishState); request.setFinalApplicationStatus(finishState);
request.setDiagnostics(sb.toString()); request.setDiagnostics(sb.toString());
request.setTrackingUrl(historyUrl); request.setTrackingUrl(historyUrl);
scheduler.finishApplicationMaster(request); scheduler.finishApplicationMaster(request);

3
hadoop-yarn-project/CHANGES.txt
View File

@ -126,6 +126,9 @@ Release 2.1.0-beta - UNRELEASED
YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. (Jian YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. (Jian
He via vinodkv) He via vinodkv)
YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in
FinishApplicationMasterRequest for consistency. (Jian He via vinodk)
NEW FEATURES NEW FEATURES
YARN-482. FS: Extend SchedulingMode to intermediate queues. YARN-482. FS: Extend SchedulingMode to intermediate queues.

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterRequest.java
View File

@ -54,7 +54,7 @@ public abstract class FinishApplicationMasterRequest {
FinishApplicationMasterRequest request = FinishApplicationMasterRequest request =
Records.newRecord(FinishApplicationMasterRequest.class); Records.newRecord(FinishApplicationMasterRequest.class);
request.setAppAttemptId(appAttemptId); request.setAppAttemptId(appAttemptId);
request.setFinishApplicationStatus(finalAppStatus); request.setFinalApplicationStatus(finalAppStatus);
request.setDiagnostics(diagnostics); request.setDiagnostics(diagnostics);
request.setTrackingUrl(url); request.setTrackingUrl(url);
return request; return request;
@ -89,12 +89,12 @@ public abstract class FinishApplicationMasterRequest {
public abstract FinalApplicationStatus getFinalApplicationStatus(); public abstract FinalApplicationStatus getFinalApplicationStatus();
/** /**
* Set the <em>finish state</em> of the <code>ApplicationMaster</code> * Set the <em>final state</em> of the <code>ApplicationMaster</code>
* @param finishState <em>finish state</em> of the <code>ApplicationMaster</code> * @param finalState <em>final state</em> of the <code>ApplicationMaster</code>
*/ */
@Public @Public
@Stable @Stable
public abstract void setFinishApplicationStatus(FinalApplicationStatus finishState); public abstract void setFinalApplicationStatus(FinalApplicationStatus finalState);
/** /**
* Get <em>diagnostic information</em> on application failure. * Get <em>diagnostic information</em> on application failure.

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterRequestPBImpl.java
View File

@ -150,13 +150,13 @@ public class FinishApplicationMasterRequestPBImpl extends FinishApplicationMaste
} }
@Override @Override
public void setFinishApplicationStatus(FinalApplicationStatus finishState) { public void setFinalApplicationStatus(FinalApplicationStatus finalState) {
maybeInitBuilder(); maybeInitBuilder();
if (finishState == null) { if (finalState == null) {
builder.clearFinalApplicationStatus(); builder.clearFinalApplicationStatus();
return; return;
} }
builder.setFinalApplicationStatus(convertToProtoFormat(finishState)); builder.setFinalApplicationStatus(convertToProtoFormat(finalState));
} }
private ApplicationAttemptIdPBImpl convertFromProtoFormat(ApplicationAttemptIdProto p) { private ApplicationAttemptIdPBImpl convertFromProtoFormat(ApplicationAttemptIdProto p) {

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/AMRMClientImpl.java
View File

@ -272,7 +272,7 @@ public class AMRMClientImpl<T extends ContainerRequest>
FinishApplicationMasterRequest request = recordFactory FinishApplicationMasterRequest request = recordFactory
.newRecordInstance(FinishApplicationMasterRequest.class); .newRecordInstance(FinishApplicationMasterRequest.class);
request.setAppAttemptId(appAttemptId); request.setAppAttemptId(appAttemptId);
request.setFinishApplicationStatus(appStatus); request.setFinalApplicationStatus(appStatus);
if(appMessage != null) { if(appMessage != null) {
request.setDiagnostics(appMessage); request.setDiagnostics(appMessage);
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java
View File

@ -168,9 +168,9 @@ public interface RMApp extends EventHandler<RMAppEvent> {
/** /**
* The final finish state of the AM when unregistering as in * The final finish state of the AM when unregistering as in
* {@link FinishApplicationMasterRequest#setFinishApplicationStatus(FinalApplicationStatus)}. * {@link FinishApplicationMasterRequest#setFinalApplicationStatus(FinalApplicationStatus)}.
* @return the final finish state of the AM as set in * @return the final finish state of the AM as set in
* {@link FinishApplicationMasterRequest#setFinishApplicationStatus(FinalApplicationStatus)}. * {@link FinishApplicationMasterRequest#setFinalApplicationStatus(FinalApplicationStatus)}.
*/ */
FinalApplicationStatus getFinalApplicationStatus(); FinalApplicationStatus getFinalApplicationStatus();

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
View File

@ -153,7 +153,7 @@ public class MockAM {
FinishApplicationMasterRequest req = Records.newRecord(FinishApplicationMasterRequest.class); FinishApplicationMasterRequest req = Records.newRecord(FinishApplicationMasterRequest.class);
req.setAppAttemptId(attemptId); req.setAppAttemptId(attemptId);
req.setDiagnostics(""); req.setDiagnostics("");
req.setFinishApplicationStatus(FinalApplicationStatus.SUCCEEDED); req.setFinalApplicationStatus(FinalApplicationStatus.SUCCEEDED);
req.setTrackingUrl(""); req.setTrackingUrl("");
amRMProtocol.finishApplicationMaster(req); amRMProtocol.finishApplicationMaster(req);
} }

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestApplicationTokens.java
View File

@ -116,7 +116,7 @@ public class TestApplicationTokens {
Records.newRecord(FinishApplicationMasterRequest.class); Records.newRecord(FinishApplicationMasterRequest.class);
finishAMRequest.setAppAttemptId(applicationAttemptId); finishAMRequest.setAppAttemptId(applicationAttemptId);
finishAMRequest finishAMRequest
.setFinishApplicationStatus(FinalApplicationStatus.SUCCEEDED); .setFinalApplicationStatus(FinalApplicationStatus.SUCCEEDED);
finishAMRequest.setDiagnostics("diagnostics"); finishAMRequest.setDiagnostics("diagnostics");
finishAMRequest.setTrackingUrl("url"); finishAMRequest.setTrackingUrl("url");
rmClient.finishApplicationMaster(finishAMRequest); rmClient.finishApplicationMaster(finishAMRequest);