You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2014/01/28 21:19:54 UTC
svn commit: r1562219 [1/4] - in
/hadoop/common/branches/branch-2/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/
hadoop-...
Author: vinodkv
Date: Tue Jan 28 20:19:53 2014
New Revision: 1562219
URL: http://svn.apache.org/r1562219
Log:
YARN-1605. Fixed formatting issues in the new module on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1559004 ../YARN-321
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportRequest.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportResponse.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsRequest.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsResponse.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportRequest.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportResponse.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersRequest.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersResponse.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnApplicationAttemptState.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ApplicationAttemptNotFoundException.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ContainerNotFoundException.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AHSClient.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSClient.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocolPB.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/impl/pb/client/ApplicationHistoryProtocolPBClientImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/impl/pb/service/ApplicationHistoryProtocolPBServiceImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationAttemptReportRequestPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationAttemptReportResponsePBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationAttemptsRequestPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationAttemptsResponsePBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerReportRequestPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerReportResponsePBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainersRequestPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainersResponsePBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationAttemptReportPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerReportPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryWriter.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/MemoryApplicationHistoryStore.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptHistoryData.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptStartDataPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationFinishDataPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationStartDataPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerFinishDataPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerStartDataPBImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSController.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebApp.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/JAXBContextResolver.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestMemoryApplicationHistoryStore.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ApplicationContext.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ContainerBlock.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebServices.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingHistoryEventType.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Jan 28 20:19:53 2014
@@ -87,6 +87,9 @@ Branch YARN-321: Generic ApplicationHist
YARN-1595. Made enabling history service configurable and fixed test failures on
branch YARN-321. (Vinod Kumar Vavilapalli via zjshen)
+ YARN-1605. Fixed formatting issues in the new module on branch YARN-321. (Vinod
+ Kumar Vavilapalli via zjshen)
+
Release 2.4.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java Tue Jan 28 20:19:53 2014
@@ -51,41 +51,54 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.exceptions.YarnException;
/**
- * <p>The protocol between clients and the <code>ApplicationHistoryServer</code>
- * to get the information of completed applications etc.</p>
+ * <p>
+ * The protocol between clients and the <code>ApplicationHistoryServer</code> to
+ * get the information of completed applications etc.
+ * </p>
*/
@Public
@Unstable
public interface ApplicationHistoryProtocol {
/**
- * <p>The interface used by clients to get a report of an Application from
- * the <code>ResourceManager</code>.</p>
- *
- * <p>The client, via {@link GetApplicationReportRequest} provides the
- * {@link ApplicationId} of the application.</p>
- *
- * <p> In secure mode,the <code>ApplicationHistoryServer</code> verifies
- * access to the application, queue etc. before accepting the request.</p>
- *
- * <p>The <code>ApplicationHistoryServer</code> responds with a
- * {@link GetApplicationReportResponse} which includes the
- * {@link ApplicationReport} for the application.</p>
- *
- * <p>If the user does not have <code>VIEW_APP</code> access then the
- * following fields in the report will be set to stubbed values:
+ * <p>
+ * The interface used by clients to get a report of an Application from the
+ * <code>ResourceManager</code>.
+ * </p>
+ *
+ * <p>
+ * The client, via {@link GetApplicationReportRequest} provides the
+ * {@link ApplicationId} of the application.
+ * </p>
+ *
+ * <p>
+ * In secure mode,the <code>ApplicationHistoryServer</code> verifies access to
+ * the application, queue etc. before accepting the request.
+ * </p>
+ *
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with a
+ * {@link GetApplicationReportResponse} which includes the
+ * {@link ApplicationReport} for the application.
+ * </p>
+ *
+ * <p>
+ * If the user does not have <code>VIEW_APP</code> access then the following
+ * fields in the report will be set to stubbed values:
* <ul>
- * <li>host - set to "N/A"</li>
- * <li>RPC port - set to -1</li>
- * <li>client token - set to "N/A"</li>
- * <li>diagnostics - set to "N/A"</li>
- * <li>tracking URL - set to "N/A"</li>
- * <li>original tracking URL - set to "N/A"</li>
- * <li>resource usage report - all values are -1</li>
- * </ul></p>
- *
- * @param request request for an application report
- * @return application report
+ * <li>host - set to "N/A"</li>
+ * <li>RPC port - set to -1</li>
+ * <li>client token - set to "N/A"</li>
+ * <li>diagnostics - set to "N/A"</li>
+ * <li>tracking URL - set to "N/A"</li>
+ * <li>original tracking URL - set to "N/A"</li>
+ * <li>resource usage report - all values are -1</li>
+ * </ul>
+ * </p>
+ *
+ * @param request
+ * request for an application report
+ * @return application report
* @throws YarnException
* @throws IOException
*/
@@ -95,52 +108,67 @@ public interface ApplicationHistoryProto
GetApplicationReportRequest request) throws YarnException, IOException;
/**
- * <p>The interface used by clients to get a report of all Applications
- * in the cluster from the <code>ApplicationHistoryServer</code>.</p>
- *
- * <p>The <code>ApplicationHistoryServer</code> responds with a
+ * <p>
+ * The interface used by clients to get a report of all Applications in the
+ * cluster from the <code>ApplicationHistoryServer</code>.
+ * </p>
+ *
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with a
* {@link GetApplicationsResponse} which includes a list of
- * {@link ApplicationReport} for all the applications.</p>
- *
- * <p>If the user does not have <code>VIEW_APP</code> access for an
- * application then the corresponding report will be filtered as
- * described in {@link #getApplicationReport(GetApplicationReportRequest)}.
+ * {@link ApplicationReport} for all the applications.
+ * </p>
+ *
+ * <p>
+ * If the user does not have <code>VIEW_APP</code> access for an application
+ * then the corresponding report will be filtered as described in
+ * {@link #getApplicationReport(GetApplicationReportRequest)}.
* </p>
- *
- * @param request request for reports on all the applications
- * @return report on applications matching the given application types
- * defined in the request
+ *
+ * @param request
+ * request for reports on all the applications
+ * @return report on applications matching the given application types defined
+ * in the request
* @throws YarnException
* @throws IOException
*/
@Public
@Unstable
- public GetApplicationsResponse getApplications(GetApplicationsRequest request)
- throws YarnException, IOException;
-
+ public GetApplicationsResponse
+ getApplications(GetApplicationsRequest request) throws YarnException,
+ IOException;
+
/**
- * <p>The interface used by clients to get a report of an Application Attempt
- * from the <code>ApplicationHistoryServer</code>.</p>
- *
- * <p>The client, via {@link GetApplicationAttemptReportRequest} provides the
- * {@link ApplicationAttemptId} of the application attempt.</p>
- *
- * <p>In secure mode,the <code>ApplicationHistoryServer</code> verifies access
- * to the method before accepting the request.</p>
- *
- * <p>The <code>ApplicationHistoryServer</code> responds with a
+ * <p>
+ * The interface used by clients to get a report of an Application Attempt
+ * from the <code>ApplicationHistoryServer</code>.
+ * </p>
+ *
+ * <p>
+ * The client, via {@link GetApplicationAttemptReportRequest} provides the
+ * {@link ApplicationAttemptId} of the application attempt.
+ * </p>
+ *
+ * <p>
+ * In secure mode,the <code>ApplicationHistoryServer</code> verifies access to
+ * the method before accepting the request.
+ * </p>
+ *
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with a
* {@link GetApplicationAttemptReportResponse} which includes the
- * {@link ApplicationAttemptReport} for the application attempt.</p>
- *
+ * {@link ApplicationAttemptReport} for the application attempt.
+ * </p>
+ *
* <p>
* If the user does not have <code>VIEW_APP</code> access then the following
* fields in the report will be set to stubbed values:
* <ul>
- * <li>host </li>
- * <li>RPC port </li>
- * <li>client token </li>
+ * <li>host</li>
+ * <li>RPC port</li>
+ * <li>client token</li>
* <li>diagnostics - set to "N/A"</li>
- * <li>tracking URL </li>
+ * <li>tracking URL</li>
* </ul>
* </p>
*
@@ -157,17 +185,23 @@ public interface ApplicationHistoryProto
IOException;
/**
- * <p>The interface used by clients to get a report of all Application
- * attempts in the cluster from the <code>ApplicationHistoryServer</code>.</p>
- *
- * <p>The <code>ApplicationHistoryServer</code> responds with a
+ * <p>
+ * The interface used by clients to get a report of all Application attempts
+ * in the cluster from the <code>ApplicationHistoryServer</code>.
+ * </p>
+ *
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with a
* {@link GetApplicationAttemptsRequest} which includes the
* {@link ApplicationAttemptReport} for all the applications attempts of a
- * specified application attempt.</p>
+ * specified application attempt.
+ * </p>
*
- * <p>If the user does not have <code>VIEW_APP</code> access for an application
+ * <p>
+ * If the user does not have <code>VIEW_APP</code> access for an application
* then the corresponding report will be filtered as described in
- * {@link #getApplicationAttemptReport(GetApplicationAttemptReportRequest)}.</p>
+ * {@link #getApplicationAttemptReport(GetApplicationAttemptReportRequest)}.
+ * </p>
*
* @param request
* request for reports on all application attempts of an application
@@ -179,20 +213,28 @@ public interface ApplicationHistoryProto
@Unstable
public GetApplicationAttemptsResponse getApplicationAttempts(
GetApplicationAttemptsRequest request) throws YarnException, IOException;
-
+
/**
- * <p>The interface used by clients to get a report of an Container from the
- * <code>ApplicationHistoryServer</code>.</p>
+ * <p>
+ * The interface used by clients to get a report of an Container from the
+ * <code>ApplicationHistoryServer</code>.
+ * </p>
*
- * <p>The client, via {@link GetContainerReportRequest} provides the
- * {@link ContainerId} of the container.</p>
+ * <p>
+ * The client, via {@link GetContainerReportRequest} provides the
+ * {@link ContainerId} of the container.
+ * </p>
*
- * <p>In secure mode,the <code>ApplicationHistoryServer</code> verifies access
- * to the method before accepting the request.</p>
+ * <p>
+ * In secure mode,the <code>ApplicationHistoryServer</code> verifies access to
+ * the method before accepting the request.
+ * </p>
*
- * <p>The <code>ApplicationHistoryServer</code> responds with a
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with a
* {@link GetContainerReportResponse} which includes the
- * {@link ContainerReport} for the container.</p>
+ * {@link ContainerReport} for the container.
+ * </p>
*
* @param request
* request for a container report
@@ -206,19 +248,27 @@ public interface ApplicationHistoryProto
GetContainerReportRequest request) throws YarnException, IOException;
/**
- * <p>The interface used by clients to get a report of Containers for an
- * application attempt from the <code>ApplciationHistoryServer</code>.</p>
+ * <p>
+ * The interface used by clients to get a report of Containers for an
+ * application attempt from the <code>ApplciationHistoryServer</code>.
+ * </p>
*
- * <p>The client, via {@link GetContainersRequest} provides the
- * {@link ApplicationAttemptId} of the application attempt.</p>
+ * <p>
+ * The client, via {@link GetContainersRequest} provides the
+ * {@link ApplicationAttemptId} of the application attempt.
+ * </p>
*
- * <p>In secure mode,the <code>ApplicationHistoryServer</code> verifies access
- * to the method before accepting the request.</p>
+ * <p>
+ * In secure mode,the <code>ApplicationHistoryServer</code> verifies access to
+ * the method before accepting the request.
+ * </p>
*
- * <p>The <code>ApplicationHistoryServer</code> responds with a
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with a
* {@link GetContainersResponse} which includes a list of
* {@link ContainerReport} for all the containers of a specific application
- * attempt.</p>
+ * attempt.
+ * </p>
*
* @param request
* request for a list of container reports of an application attempt.
@@ -230,16 +280,21 @@ public interface ApplicationHistoryProto
@Unstable
public GetContainersResponse getContainers(GetContainersRequest request)
throws YarnException, IOException;
-
+
/**
- * <p>The interface used by clients to get delegation token, enabling the
- * containers to be able to talk to the service using those tokens.</p>
- *
- * <p>The <code>ApplicationHistoryServer</code> responds with the delegation
+ * <p>
+ * The interface used by clients to get delegation token, enabling the
+ * containers to be able to talk to the service using those tokens.
+ * </p>
+ *
+ * <p>
+ * The <code>ApplicationHistoryServer</code> responds with the delegation
* token {@link Token} that can be used by the client to speak to this
- * service.</p>
- *
- * @param request request to get a delegation token for the client.
+ * service.
+ * </p>
+ *
+ * @param request
+ * request to get a delegation token for the client.
* @return delegation token that can be used to talk to this service
* @throws YarnException
* @throws IOException
@@ -248,11 +303,12 @@ public interface ApplicationHistoryProto
@Unstable
public GetDelegationTokenResponse getDelegationToken(
GetDelegationTokenRequest request) throws YarnException, IOException;
-
+
/**
* Renew an existing delegation token.
*
- * @param request the delegation token to be renewed.
+ * @param request
+ * the delegation token to be renewed.
* @return the new expiry time for the delegation token.
* @throws YarnException
* @throws IOException
@@ -265,7 +321,8 @@ public interface ApplicationHistoryProto
/**
* Cancel an existing delegation token.
*
- * @param request the delegation token to be cancelled.
+ * @param request
+ * the delegation token to be cancelled.
* @return an empty response.
* @throws YarnException
* @throws IOException
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportRequest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportRequest.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportRequest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportRequest.java Tue Jan 28 20:19:53 2014
@@ -26,12 +26,16 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The request sent by a client to the <code>ResourceManager</code> to get
- * an {@link ApplicationAttemptReport} for an application attempt.</p>
- *
- * <p>The request should include the {@link ApplicationAttemptId} of the
- * application attempt.</p>
- *
+ * <p>
+ * The request sent by a client to the <code>ResourceManager</code> to get an
+ * {@link ApplicationAttemptReport} for an application attempt.
+ * </p>
+ *
+ * <p>
+ * The request should include the {@link ApplicationAttemptId} of the
+ * application attempt.
+ * </p>
+ *
* @see ApplicationAttemptReport
* @see ApplicationHistoryProtocol#getApplicationAttemptReport(GetApplicationAttemptReportRequest)
*/
@@ -51,7 +55,7 @@ public abstract class GetApplicationAtte
/**
* Get the <code>ApplicationAttemptId</code> of an application attempt.
- *
+ *
* @return <code>ApplicationAttemptId</code> of an application attempt
*/
@Public
@@ -60,9 +64,9 @@ public abstract class GetApplicationAtte
/**
* Set the <code>ApplicationAttemptId</code> of an application attempt
- *
- * @param applicationAttemptId <code>ApplicationAttemptId</code> of an
- * application attempt
+ *
+ * @param applicationAttemptId
+ * <code>ApplicationAttemptId</code> of an application attempt
*/
@Public
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportResponse.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportResponse.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportResponse.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptReportResponse.java Tue Jan 28 20:19:53 2014
@@ -25,12 +25,16 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The response sent by the <code>ResourceManager</code> to a client requesting
- * an application attempt report.</p>
- *
- * <p>The response includes an {@link ApplicationAttemptReport} which has the
- * details about the particular application attempt</p>
- *
+ * <p>
+ * The response sent by the <code>ResourceManager</code> to a client requesting
+ * an application attempt report.
+ * </p>
+ *
+ * <p>
+ * The response includes an {@link ApplicationAttemptReport} which has the
+ * details about the particular application attempt
+ * </p>
+ *
* @see ApplicationAttemptReport
* @see ApplicationHistoryProtocol#getApplicationAttemptReport(GetApplicationAttemptReportRequest)
*/
@@ -59,9 +63,9 @@ public abstract class GetApplicationAtte
/**
* Get the <code>ApplicationAttemptReport</code> for the application attempt.
- *
- * @param applicationAttemptReport <code>ApplicationAttemptReport</code> for
- * the application attempt
+ *
+ * @param applicationAttemptReport
+ * <code>ApplicationAttemptReport</code> for the application attempt
*/
@Public
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsRequest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsRequest.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsRequest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsRequest.java Tue Jan 28 20:19:53 2014
@@ -25,9 +25,11 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The request from clients to get a list of application attempt reports of
- * an application from the <code>ResourceManager</code>.</p>
- *
+ * <p>
+ * The request from clients to get a list of application attempt reports of an
+ * application from the <code>ResourceManager</code>.
+ * </p>
+ *
* @see ApplicationHistoryProtocol#getApplicationAttempts(GetApplicationAttemptsRequest)
*/
@Public
@@ -46,7 +48,7 @@ public abstract class GetApplicationAtte
/**
* Get the <code>ApplicationId</code> of an application
- *
+ *
* @return <code>ApplicationId</code> of an application
*/
@Public
@@ -55,8 +57,9 @@ public abstract class GetApplicationAtte
/**
* Set the <code>ApplicationId</code> of an application
- *
- * @param applicationId <code>ApplicationId</code> of an application
+ *
+ * @param applicationId
+ * <code>ApplicationId</code> of an application
*/
@Public
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsResponse.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsResponse.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsResponse.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationAttemptsResponse.java Tue Jan 28 20:19:53 2014
@@ -27,15 +27,18 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The response sent by the <code>ResourceManager</code> to a client
- * requesting a list of {@link ApplicationAttemptReport} for application
- * attempts.</p>
- *
- * <p>The <code>ApplicationAttemptReport</code> for each application includes
- * the details of an application attempt.</p>
- *
+ * <p>
+ * The response sent by the <code>ResourceManager</code> to a client requesting
+ * a list of {@link ApplicationAttemptReport} for application attempts.
+ * </p>
+ *
+ * <p>
+ * The <code>ApplicationAttemptReport</code> for each application includes the
+ * details of an application attempt.
+ * </p>
+ *
* @see ApplicationAttemptReport
- * @see ApplicationHistoryProtocol#getApplicationAttempts(GetApplicationAttemptsRequest)
+ * @see ApplicationHistoryProtocol#getApplicationAttempts(GetApplicationAttemptsRequest)
*/
@Public
@Unstable
@@ -63,8 +66,8 @@ public abstract class GetApplicationAtte
/**
* Get a list of <code>ApplicationReport</code> of an application.
*
- * @param applicationAttempts a list of <code>ApplicationReport</code> of an
- * application
+ * @param applicationAttempts
+ * a list of <code>ApplicationReport</code> of an application
*/
@Public
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportRequest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportRequest.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportRequest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportRequest.java Tue Jan 28 20:19:53 2014
@@ -25,8 +25,10 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The request sent by a client to the <code>ResourceManager</code> to
- * get an {@link ContainerReport} for a container.</p>
+ * <p>
+ * The request sent by a client to the <code>ResourceManager</code> to get an
+ * {@link ContainerReport} for a container.
+ * </p>
*/
@Public
@Unstable
@@ -35,7 +37,8 @@ public abstract class GetContainerReport
@Public
@Unstable
public static GetContainerReportRequest newInstance(ContainerId containerId) {
- GetContainerReportRequest request = Records.newRecord(GetContainerReportRequest.class);
+ GetContainerReportRequest request =
+ Records.newRecord(GetContainerReportRequest.class);
request.setContainerId(containerId);
return request;
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportResponse.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportResponse.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportResponse.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerReportResponse.java Tue Jan 28 20:19:53 2014
@@ -24,11 +24,15 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The response sent by the <code>ResourceManager</code> to a client
- * requesting a container report.</p>
+ * <p>
+ * The response sent by the <code>ResourceManager</code> to a client requesting
+ * a container report.
+ * </p>
*
- * <p>The response includes a {@link ContainerReport} which has details of a
- * container.</p>
+ * <p>
+ * The response includes a {@link ContainerReport} which has details of a
+ * container.
+ * </p>
*
*/
@Public
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersRequest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersRequest.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersRequest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersRequest.java Tue Jan 28 20:19:53 2014
@@ -25,9 +25,11 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The request from clients to get a list of container reports, which belong
- * to an application attempt from the <code>ResourceManager</code>.</p>
- *
+ * <p>
+ * The request from clients to get a list of container reports, which belong to
+ * an application attempt from the <code>ResourceManager</code>.
+ * </p>
+ *
* @see ApplicationHistoryProtocol#getContainers(GetContainersRequest)
*/
@Public
@@ -55,8 +57,8 @@ public abstract class GetContainersReque
/**
* Set the <code>ApplicationAttemptId</code> of an application attempt
*
- * @param applicationAttemptId <code>ApplicationAttemptId</code> of an
- * application attempt
+ * @param applicationAttemptId
+ * <code>ApplicationAttemptId</code> of an application attempt
*/
@Public
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersResponse.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersResponse.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersResponse.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainersResponse.java Tue Jan 28 20:19:53 2014
@@ -27,12 +27,16 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * <p>The response sent by the <code>ResourceManager</code> to a client
- * requesting a list of {@link ContainerReport} for containers.</p>
- *
- * <p>The <code>ContainerReport</code> for each container includes the container
- * details.</p>
- *
+ * <p>
+ * The response sent by the <code>ResourceManager</code> to a client requesting
+ * a list of {@link ContainerReport} for containers.
+ * </p>
+ *
+ * <p>
+ * The <code>ContainerReport</code> for each container includes the container
+ * details.
+ * </p>
+ *
* @see ContainerReport
* @see ApplicationHistoryProtocol#getContainers(GetContainersRequest)
*/
@@ -42,7 +46,8 @@ public abstract class GetContainersRespo
@Public
@Unstable
- public static GetContainersResponse newInstance(List<ContainerReport> containers) {
+ public static GetContainersResponse newInstance(
+ List<ContainerReport> containers) {
GetContainersResponse response =
Records.newRecord(GetContainersResponse.class);
response.setContainerList(containers);
@@ -53,9 +58,9 @@ public abstract class GetContainersRespo
* Get a list of <code>ContainerReport</code> for all the containers of an
* application attempt.
*
- * @return a list of <code>ContainerReport</code> for all the containers of
- * an application attempt
- *
+ * @return a list of <code>ContainerReport</code> for all the containers of an
+ * application attempt
+ *
*/
@Public
@Unstable
@@ -65,9 +70,10 @@ public abstract class GetContainersRespo
* Set a list of <code>ContainerReport</code> for all the containers of an
* application attempt.
*
- * @param containers a list of <code>ContainerReport</code> for all the
- * containers of an application attempt
- *
+ * @param containers
+ * a list of <code>ContainerReport</code> for all the containers of
+ * an application attempt
+ *
*/
@Public
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java Tue Jan 28 20:19:53 2014
@@ -27,7 +27,7 @@ import org.apache.hadoop.yarn.util.Recor
* <p>
* <code>ApplicationAttemptReport</code> is a report of an application attempt.
* </p>
- *
+ *
* <p>
* It includes details such as:
* <ul>
@@ -41,7 +41,7 @@ import org.apache.hadoop.yarn.util.Recor
* <li>{@link ContainerId} of the master Container.</li>
* </ul>
* </p>
- *
+ *
*/
@Public
@Unstable
@@ -67,7 +67,7 @@ public abstract class ApplicationAttempt
/**
* Get the <em>YarnApplicationAttemptState</em> of the application attempt.
- *
+ *
* @return <em>YarnApplicationAttemptState</em> of the application attempt
*/
@Public
@@ -81,7 +81,7 @@ public abstract class ApplicationAttempt
/**
* Get the <em>RPC port</em> of this attempt <code>ApplicationMaster</code>.
- *
+ *
* @return <em>RPC port</em> of this attempt <code>ApplicationMaster</code>
*/
@Public
@@ -95,7 +95,7 @@ public abstract class ApplicationAttempt
/**
* Get the <em>host</em> on which this attempt of
* <code>ApplicationMaster</code> is running.
- *
+ *
* @return <em>host</em> on which this attempt of
* <code>ApplicationMaster</code> is running
*/
@@ -110,7 +110,7 @@ public abstract class ApplicationAttempt
/**
* Get the <em>diagnositic information</em> of the application attempt in case
* of errors.
- *
+ *
* @return <em>diagnositic information</em> of the application attempt in case
* of errors
*/
@@ -124,7 +124,7 @@ public abstract class ApplicationAttempt
/**
* Get the <em>tracking url</em> for the application attempt.
- *
+ *
* @return <em>tracking url</em> for the application attempt
*/
@Public
@@ -138,7 +138,7 @@ public abstract class ApplicationAttempt
/**
* Get the <code>ApplicationAttemptId</code> of this attempt of the
* application
- *
+ *
* @return <code>ApplicationAttemptId</code> of the attempt
*/
@Public
@@ -152,7 +152,7 @@ public abstract class ApplicationAttempt
/**
* Get the <code>ContainerId</code> of AMContainer for this attempt
- *
+ *
* @return <code>ContainerId</code> of the attempt
*/
@Public
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnApplicationAttemptState.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnApplicationAttemptState.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnApplicationAttemptState.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnApplicationAttemptState.java Tue Jan 28 20:19:53 2014
@@ -33,16 +33,16 @@ public enum YarnApplicationAttemptState
/** AppAttempt has been submitted. */
SUBMITTED,
- /**AppAttempt was scheduled*/
+ /** AppAttempt was scheduled */
SCHEDULED,
- /**Acquired AM Container from Scheduler and Saving AppAttempt Data*/
+ /** Acquired AM Container from Scheduler and Saving AppAttempt Data */
ALLOCATED_SAVING,
- /**AppAttempt Data was saved*/
+ /** AppAttempt Data was saved */
ALLOCATED,
- /**AppAttempt was launched*/
+ /** AppAttempt was launched */
LAUNCHED,
/** AppAttempt failed. */
@@ -51,7 +51,7 @@ public enum YarnApplicationAttemptState
/** AppAttempt is currently running. */
RUNNING,
- /** AppAttempt is waiting for state bing saved*/
+ /** AppAttempt is waiting for state bing saved */
FINAL_SAVING,
/** AppAttempt is finishing. */
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ApplicationAttemptNotFoundException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ApplicationAttemptNotFoundException.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ApplicationAttemptNotFoundException.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ApplicationAttemptNotFoundException.java Tue Jan 28 20:19:53 2014
@@ -25,8 +25,7 @@ import org.apache.hadoop.yarn.api.protoc
/**
* This exception is thrown on
- * {@link ApplicationHistoryProtocol#getApplicationAttemptReport
- * (GetApplicationAttemptReportRequest)}
+ * {@link ApplicationHistoryProtocol#getApplicationAttemptReport (GetApplicationAttemptReportRequest)}
* API when the Application Attempt doesn't exist in Application History Server
*/
@Public
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ContainerNotFoundException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ContainerNotFoundException.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ContainerNotFoundException.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/exceptions/ContainerNotFoundException.java Tue Jan 28 20:19:53 2014
@@ -25,8 +25,7 @@ import org.apache.hadoop.yarn.api.protoc
/**
* This exception is thrown on
- * {@link ApplicationHistoryProtocol#getContainerReport
- * (GetContainerReportRequest)}
+ * {@link ApplicationHistoryProtocol#getContainerReport (GetContainerReportRequest)}
* API when the container doesn't exist in AHS
*/
@Public
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AHSClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AHSClient.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AHSClient.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AHSClient.java Tue Jan 28 20:19:53 2014
@@ -126,7 +126,8 @@ public abstract class AHSClient extends
* @throws IOException
*/
public abstract ApplicationAttemptReport getApplicationAttemptReport(
- ApplicationAttemptId applicationAttemptId) throws YarnException, IOException;
+ ApplicationAttemptId applicationAttemptId) throws YarnException,
+ IOException;
/**
* <p>
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java Tue Jan 28 20:19:53 2014
@@ -50,7 +50,6 @@ import org.apache.hadoop.yarn.client.api
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
-import org.apache.hadoop.yarn.util.Records;
@Private
@Unstable
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSClient.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSClient.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSClient.java Tue Jan 28 20:19:53 2014
@@ -77,8 +77,8 @@ public class TestAHSClient {
client.init(conf);
client.start();
- List<ApplicationReport> expectedReports = ((MockAHSClient) client)
- .getReports();
+ List<ApplicationReport> expectedReports =
+ ((MockAHSClient) client).getReports();
List<ApplicationReport> reports = client.getApplications();
Assert.assertEquals(reports, expectedReports);
@@ -95,13 +95,13 @@ public class TestAHSClient {
client.init(conf);
client.start();
- List<ApplicationReport> expectedReports = ((MockAHSClient) client)
- .getReports();
+ List<ApplicationReport> expectedReports =
+ ((MockAHSClient) client).getReports();
ApplicationId applicationId = ApplicationId.newInstance(1234, 5);
ApplicationReport report = client.getApplicationReport(applicationId);
Assert.assertEquals(report, expectedReports.get(0));
Assert.assertEquals(report.getApplicationId().toString(), expectedReports
- .get(0).getApplicationId().toString());
+ .get(0).getApplicationId().toString());
client.stop();
}
@@ -113,13 +113,13 @@ public class TestAHSClient {
client.start();
ApplicationId applicationId = ApplicationId.newInstance(1234, 5);
- List<ApplicationAttemptReport> reports = client
- .getApplicationAttempts(applicationId);
+ List<ApplicationAttemptReport> reports =
+ client.getApplicationAttempts(applicationId);
Assert.assertNotNull(reports);
Assert.assertEquals(reports.get(0).getApplicationAttemptId(),
- ApplicationAttemptId.newInstance(applicationId, 1));
+ ApplicationAttemptId.newInstance(applicationId, 1));
Assert.assertEquals(reports.get(1).getApplicationAttemptId(),
- ApplicationAttemptId.newInstance(applicationId, 2));
+ ApplicationAttemptId.newInstance(applicationId, 2));
client.stop();
}
@@ -130,17 +130,17 @@ public class TestAHSClient {
client.init(conf);
client.start();
- List<ApplicationReport> expectedReports = ((MockAHSClient) client)
- .getReports();
+ List<ApplicationReport> expectedReports =
+ ((MockAHSClient) client).getReports();
ApplicationId applicationId = ApplicationId.newInstance(1234, 5);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(
- applicationId, 1);
- ApplicationAttemptReport report = client
- .getApplicationAttemptReport(appAttemptId);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(applicationId, 1);
+ ApplicationAttemptReport report =
+ client.getApplicationAttemptReport(appAttemptId);
Assert.assertNotNull(report);
Assert.assertEquals(report.getApplicationAttemptId().toString(),
- expectedReports.get(0).getCurrentApplicationAttemptId().toString());
+ expectedReports.get(0).getCurrentApplicationAttemptId().toString());
client.stop();
}
@@ -152,14 +152,14 @@ public class TestAHSClient {
client.start();
ApplicationId applicationId = ApplicationId.newInstance(1234, 5);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(
- applicationId, 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(applicationId, 1);
List<ContainerReport> reports = client.getContainers(appAttemptId);
Assert.assertNotNull(reports);
- Assert.assertEquals(reports.get(0).getContainerId(), (ContainerId
- .newInstance(appAttemptId, 1)));
- Assert.assertEquals(reports.get(1).getContainerId(), (ContainerId
- .newInstance(appAttemptId, 2)));
+ Assert.assertEquals(reports.get(0).getContainerId(),
+ (ContainerId.newInstance(appAttemptId, 1)));
+ Assert.assertEquals(reports.get(1).getContainerId(),
+ (ContainerId.newInstance(appAttemptId, 2)));
client.stop();
}
@@ -170,40 +170,41 @@ public class TestAHSClient {
client.init(conf);
client.start();
- List<ApplicationReport> expectedReports = ((MockAHSClient) client)
- .getReports();
+ List<ApplicationReport> expectedReports =
+ ((MockAHSClient) client).getReports();
ApplicationId applicationId = ApplicationId.newInstance(1234, 5);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(
- applicationId, 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(applicationId, 1);
ContainerId containerId = ContainerId.newInstance(appAttemptId, 1);
ContainerReport report = client.getContainerReport(containerId);
Assert.assertNotNull(report);
- Assert.assertEquals(report.getContainerId().toString(),
- (ContainerId.newInstance(expectedReports.get(0)
- .getCurrentApplicationAttemptId(), 1)).toString());
+ Assert.assertEquals(report.getContainerId().toString(), (ContainerId
+ .newInstance(expectedReports.get(0).getCurrentApplicationAttemptId(), 1))
+ .toString());
client.stop();
}
private static class MockAHSClient extends AHSClientImpl {
// private ApplicationReport mockReport;
- private List<ApplicationReport> reports = new ArrayList<ApplicationReport>();
- private HashMap<ApplicationId, List<ApplicationAttemptReport>> attempts =
- new HashMap<ApplicationId, List<ApplicationAttemptReport>>();
- private HashMap<ApplicationAttemptId, List<ContainerReport>> containers =
- new HashMap<ApplicationAttemptId, List<ContainerReport>>();
+ private List<ApplicationReport> reports =
+ new ArrayList<ApplicationReport>();
+ private HashMap<ApplicationId, List<ApplicationAttemptReport>> attempts =
+ new HashMap<ApplicationId, List<ApplicationAttemptReport>>();
+ private HashMap<ApplicationAttemptId, List<ContainerReport>> containers =
+ new HashMap<ApplicationAttemptId, List<ContainerReport>>();
GetApplicationsResponse mockAppResponse =
- mock(GetApplicationsResponse.class);
- GetApplicationReportResponse mockResponse =
- mock(GetApplicationReportResponse.class);
+ mock(GetApplicationsResponse.class);
+ GetApplicationReportResponse mockResponse =
+ mock(GetApplicationReportResponse.class);
GetApplicationAttemptsResponse mockAppAttemptsResponse =
- mock(GetApplicationAttemptsResponse.class);
- GetApplicationAttemptReportResponse mockAttemptResponse =
- mock(GetApplicationAttemptReportResponse.class);
- GetContainersResponse mockContainersResponse =
- mock(GetContainersResponse.class);
- GetContainerReportResponse mockContainerResponse =
- mock(GetContainerReportResponse.class);
+ mock(GetApplicationAttemptsResponse.class);
+ GetApplicationAttemptReportResponse mockAttemptResponse =
+ mock(GetApplicationAttemptReportResponse.class);
+ GetContainersResponse mockContainersResponse =
+ mock(GetContainersResponse.class);
+ GetContainerReportResponse mockContainerResponse =
+ mock(GetContainerReportResponse.class);
public MockAHSClient() {
super();
@@ -216,24 +217,24 @@ public class TestAHSClient {
try {
when(
- ahsClient
- .getApplicationReport(any(GetApplicationReportRequest.class)))
- .thenReturn(mockResponse);
+ ahsClient
+ .getApplicationReport(any(GetApplicationReportRequest.class)))
+ .thenReturn(mockResponse);
when(ahsClient.getApplications(any(GetApplicationsRequest.class)))
- .thenReturn(mockAppResponse);
+ .thenReturn(mockAppResponse);
when(
- ahsClient
- .getApplicationAttemptReport(any(GetApplicationAttemptReportRequest.class)))
- .thenReturn(mockAttemptResponse);
+ ahsClient
+ .getApplicationAttemptReport(any(GetApplicationAttemptReportRequest.class)))
+ .thenReturn(mockAttemptResponse);
when(
- ahsClient
- .getApplicationAttempts(any(GetApplicationAttemptsRequest.class)))
- .thenReturn(mockAppAttemptsResponse);
+ ahsClient
+ .getApplicationAttempts(any(GetApplicationAttemptsRequest.class)))
+ .thenReturn(mockAppAttemptsResponse);
when(ahsClient.getContainers(any(GetContainersRequest.class)))
- .thenReturn(mockContainersResponse);
+ .thenReturn(mockContainersResponse);
when(ahsClient.getContainerReport(any(GetContainerReportRequest.class)))
- .thenReturn(mockContainerResponse);
+ .thenReturn(mockContainerResponse);
} catch (YarnException e) {
Assert.fail("Exception is not expected.");
@@ -260,7 +261,7 @@ public class TestAHSClient {
public List<ApplicationAttemptReport> getApplicationAttempts(
ApplicationId appId) throws YarnException, IOException {
when(mockAppAttemptsResponse.getApplicationAttemptList()).thenReturn(
- getAttempts(appId));
+ getAttempts(appId));
return super.getApplicationAttempts(appId);
}
@@ -268,15 +269,16 @@ public class TestAHSClient {
public ApplicationAttemptReport getApplicationAttemptReport(
ApplicationAttemptId appAttemptId) throws YarnException, IOException {
when(mockAttemptResponse.getApplicationAttemptReport()).thenReturn(
- getAttempt(appAttemptId));
+ getAttempt(appAttemptId));
return super.getApplicationAttemptReport(appAttemptId);
}
@Override
- public List<ContainerReport> getContainers(ApplicationAttemptId appAttemptId)
- throws YarnException, IOException {
+ public List<ContainerReport>
+ getContainers(ApplicationAttemptId appAttemptId) throws YarnException,
+ IOException {
when(mockContainersResponse.getContainerList()).thenReturn(
- getContainersReport(appAttemptId));
+ getContainersReport(appAttemptId));
return super.getContainers(appAttemptId);
}
@@ -284,7 +286,7 @@ public class TestAHSClient {
public ContainerReport getContainerReport(ContainerId containerId)
throws YarnException, IOException {
when(mockContainerResponse.getContainerReport()).thenReturn(
- getContainer(containerId));
+ getContainer(containerId));
return super.getContainerReport(containerId);
}
@@ -295,7 +297,7 @@ public class TestAHSClient {
public ApplicationReport getReport(ApplicationId appId) {
for (int i = 0; i < reports.size(); ++i) {
if (appId.toString().equalsIgnoreCase(
- reports.get(i).getApplicationId().toString())) {
+ reports.get(i).getApplicationId().toString())) {
return reports.get(i);
}
}
@@ -306,7 +308,8 @@ public class TestAHSClient {
return attempts.get(appId);
}
- public ApplicationAttemptReport getAttempt(ApplicationAttemptId appAttemptId) {
+ public ApplicationAttemptReport
+ getAttempt(ApplicationAttemptId appAttemptId) {
return attempts.get(appAttemptId.getApplicationId()).get(0);
}
@@ -325,68 +328,86 @@ public class TestAHSClient {
private void createAppReports() {
ApplicationId applicationId = ApplicationId.newInstance(1234, 5);
- ApplicationReport newApplicationReport = ApplicationReport
- .newInstance(applicationId, ApplicationAttemptId.newInstance(
- applicationId, 1), "user", "queue", "appname", "host", 124, null,
- YarnApplicationState.RUNNING, "diagnostics", "url", 0, 0,
- FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.53789f, "YARN",
- null);
- List<ApplicationReport> applicationReports = new ArrayList<ApplicationReport>();
+ ApplicationReport newApplicationReport =
+ ApplicationReport.newInstance(applicationId,
+ ApplicationAttemptId.newInstance(applicationId, 1), "user",
+ "queue", "appname", "host", 124, null,
+ YarnApplicationState.RUNNING, "diagnostics", "url", 0, 0,
+ FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.53789f, "YARN",
+ null);
+ List<ApplicationReport> applicationReports =
+ new ArrayList<ApplicationReport>();
applicationReports.add(newApplicationReport);
- List<ApplicationAttemptReport> appAttempts = new ArrayList<ApplicationAttemptReport>();
- ApplicationAttemptReport attempt = ApplicationAttemptReport.newInstance(
- ApplicationAttemptId.newInstance(applicationId, 1), "host", 124,
- "url", "diagnostics", YarnApplicationAttemptState.FINISHED,
- ContainerId.newInstance(newApplicationReport
- .getCurrentApplicationAttemptId(), 1));
+ List<ApplicationAttemptReport> appAttempts =
+ new ArrayList<ApplicationAttemptReport>();
+ ApplicationAttemptReport attempt =
+ ApplicationAttemptReport.newInstance(
+ ApplicationAttemptId.newInstance(applicationId, 1),
+ "host",
+ 124,
+ "url",
+ "diagnostics",
+ YarnApplicationAttemptState.FINISHED,
+ ContainerId.newInstance(
+ newApplicationReport.getCurrentApplicationAttemptId(), 1));
appAttempts.add(attempt);
- ApplicationAttemptReport attempt1 = ApplicationAttemptReport.newInstance(
- ApplicationAttemptId.newInstance(applicationId, 2), "host", 124,
- "url", "diagnostics", YarnApplicationAttemptState.FINISHED,
- ContainerId.newInstance(newApplicationReport
- .getCurrentApplicationAttemptId(), 2));
+ ApplicationAttemptReport attempt1 =
+ ApplicationAttemptReport.newInstance(
+ ApplicationAttemptId.newInstance(applicationId, 2),
+ "host",
+ 124,
+ "url",
+ "diagnostics",
+ YarnApplicationAttemptState.FINISHED,
+ ContainerId.newInstance(
+ newApplicationReport.getCurrentApplicationAttemptId(), 2));
appAttempts.add(attempt1);
attempts.put(applicationId, appAttempts);
List<ContainerReport> containerReports = new ArrayList<ContainerReport>();
- ContainerReport container = ContainerReport.newInstance(ContainerId
- .newInstance(attempt.getApplicationAttemptId(), 1), null, NodeId
- .newInstance("host", 1234), Priority.UNDEFINED, 1234, 5678,
- "diagnosticInfo", "logURL", 0, ContainerState.COMPLETE);
+ ContainerReport container =
+ ContainerReport.newInstance(
+ ContainerId.newInstance(attempt.getApplicationAttemptId(), 1),
+ null, NodeId.newInstance("host", 1234), Priority.UNDEFINED, 1234,
+ 5678, "diagnosticInfo", "logURL", 0, ContainerState.COMPLETE);
containerReports.add(container);
- ContainerReport container1 = ContainerReport.newInstance(ContainerId
- .newInstance(attempt.getApplicationAttemptId(), 2), null, NodeId
- .newInstance("host", 1234), Priority.UNDEFINED, 1234, 5678,
- "diagnosticInfo", "logURL", 0, ContainerState.COMPLETE);
+ ContainerReport container1 =
+ ContainerReport.newInstance(
+ ContainerId.newInstance(attempt.getApplicationAttemptId(), 2),
+ null, NodeId.newInstance("host", 1234), Priority.UNDEFINED, 1234,
+ 5678, "diagnosticInfo", "logURL", 0, ContainerState.COMPLETE);
containerReports.add(container1);
containers.put(attempt.getApplicationAttemptId(), containerReports);
ApplicationId applicationId2 = ApplicationId.newInstance(1234, 6);
- ApplicationReport newApplicationReport2 = ApplicationReport.newInstance(
- applicationId2, ApplicationAttemptId.newInstance(applicationId2, 2),
- "user2", "queue2", "appname2", "host2", 125, null,
- YarnApplicationState.FINISHED, "diagnostics2", "url2", 2, 2,
- FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.63789f, "NON-YARN",
- null);
+ ApplicationReport newApplicationReport2 =
+ ApplicationReport.newInstance(applicationId2,
+ ApplicationAttemptId.newInstance(applicationId2, 2), "user2",
+ "queue2", "appname2", "host2", 125, null,
+ YarnApplicationState.FINISHED, "diagnostics2", "url2", 2, 2,
+ FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.63789f,
+ "NON-YARN", null);
applicationReports.add(newApplicationReport2);
ApplicationId applicationId3 = ApplicationId.newInstance(1234, 7);
- ApplicationReport newApplicationReport3 = ApplicationReport.newInstance(
- applicationId3, ApplicationAttemptId.newInstance(applicationId3, 3),
- "user3", "queue3", "appname3", "host3", 126, null,
- YarnApplicationState.RUNNING, "diagnostics3", "url3", 3, 3,
- FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.73789f, "MAPREDUCE",
- null);
+ ApplicationReport newApplicationReport3 =
+ ApplicationReport.newInstance(applicationId3,
+ ApplicationAttemptId.newInstance(applicationId3, 3), "user3",
+ "queue3", "appname3", "host3", 126, null,
+ YarnApplicationState.RUNNING, "diagnostics3", "url3", 3, 3,
+ FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.73789f,
+ "MAPREDUCE", null);
applicationReports.add(newApplicationReport3);
ApplicationId applicationId4 = ApplicationId.newInstance(1234, 8);
- ApplicationReport newApplicationReport4 = ApplicationReport.newInstance(
- applicationId4, ApplicationAttemptId.newInstance(applicationId4, 4),
- "user4", "queue4", "appname4", "host4", 127, null,
- YarnApplicationState.FAILED, "diagnostics4", "url4", 4, 4,
- FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.83789f,
- "NON-MAPREDUCE", null);
+ ApplicationReport newApplicationReport4 =
+ ApplicationReport.newInstance(applicationId4,
+ ApplicationAttemptId.newInstance(applicationId4, 4), "user4",
+ "queue4", "appname4", "host4", 127, null,
+ YarnApplicationState.FAILED, "diagnostics4", "url4", 4, 4,
+ FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.83789f,
+ "NON-MAPREDUCE", null);
applicationReports.add(newApplicationReport4);
reports = applicationReports;
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocolPB.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocolPB.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocolPB.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocolPB.java Tue Jan 28 20:19:53 2014
@@ -25,7 +25,9 @@ import org.apache.hadoop.yarn.proto.Appl
@Private
@Unstable
-@ProtocolInfo(protocolName = "org.apache.hadoop.yarn.api.ApplicationHistoryProtocolPB", protocolVersion = 1)
+@ProtocolInfo(
+ protocolName = "org.apache.hadoop.yarn.api.ApplicationHistoryProtocolPB",
+ protocolVersion = 1)
public interface ApplicationHistoryProtocolPB extends
ApplicationHistoryProtocolService.BlockingInterface {
}
\ No newline at end of file
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/impl/pb/client/ApplicationHistoryProtocolPBClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/impl/pb/client/ApplicationHistoryProtocolPBClientImpl.java?rev=1562219&r1=1562218&r2=1562219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/impl/pb/client/ApplicationHistoryProtocolPBClientImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/impl/pb/client/ApplicationHistoryProtocolPBClientImpl.java Tue Jan 28 20:19:53 2014
@@ -86,9 +86,10 @@ public class ApplicationHistoryProtocolP
public ApplicationHistoryProtocolPBClientImpl(long clientVersion,
InetSocketAddress addr, Configuration conf) throws IOException {
RPC.setProtocolEngine(conf, ApplicationHistoryProtocolPB.class,
- ProtobufRpcEngine.class);
- proxy = RPC.getProxy(ApplicationHistoryProtocolPB.class, clientVersion,
- addr, conf);
+ ProtobufRpcEngine.class);
+ proxy =
+ RPC.getProxy(ApplicationHistoryProtocolPB.class, clientVersion, addr,
+ conf);
}
@Override
@@ -101,11 +102,11 @@ public class ApplicationHistoryProtocolP
@Override
public GetApplicationReportResponse getApplicationReport(
GetApplicationReportRequest request) throws YarnException, IOException {
- GetApplicationReportRequestProto requestProto = ((GetApplicationReportRequestPBImpl) request)
- .getProto();
+ GetApplicationReportRequestProto requestProto =
+ ((GetApplicationReportRequestPBImpl) request).getProto();
try {
return new GetApplicationReportResponsePBImpl(proxy.getApplicationReport(
- null, requestProto));
+ null, requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -113,13 +114,14 @@ public class ApplicationHistoryProtocolP
}
@Override
- public GetApplicationsResponse getApplications(GetApplicationsRequest request)
- throws YarnException, IOException {
- GetApplicationsRequestProto requestProto = ((GetApplicationsRequestPBImpl) request)
- .getProto();
+ public GetApplicationsResponse
+ getApplications(GetApplicationsRequest request) throws YarnException,
+ IOException {
+ GetApplicationsRequestProto requestProto =
+ ((GetApplicationsRequestPBImpl) request).getProto();
try {
return new GetApplicationsResponsePBImpl(proxy.getApplications(null,
- requestProto));
+ requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -130,11 +132,11 @@ public class ApplicationHistoryProtocolP
public GetApplicationAttemptReportResponse getApplicationAttemptReport(
GetApplicationAttemptReportRequest request) throws YarnException,
IOException {
- GetApplicationAttemptReportRequestProto requestProto = ((GetApplicationAttemptReportRequestPBImpl) request)
- .getProto();
+ GetApplicationAttemptReportRequestProto requestProto =
+ ((GetApplicationAttemptReportRequestPBImpl) request).getProto();
try {
- return new GetApplicationAttemptReportResponsePBImpl(proxy
- .getApplicationAttemptReport(null, requestProto));
+ return new GetApplicationAttemptReportResponsePBImpl(
+ proxy.getApplicationAttemptReport(null, requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -144,11 +146,11 @@ public class ApplicationHistoryProtocolP
@Override
public GetApplicationAttemptsResponse getApplicationAttempts(
GetApplicationAttemptsRequest request) throws YarnException, IOException {
- GetApplicationAttemptsRequestProto requestProto = ((GetApplicationAttemptsRequestPBImpl) request)
- .getProto();
+ GetApplicationAttemptsRequestProto requestProto =
+ ((GetApplicationAttemptsRequestPBImpl) request).getProto();
try {
- return new GetApplicationAttemptsResponsePBImpl(proxy
- .getApplicationAttempts(null, requestProto));
+ return new GetApplicationAttemptsResponsePBImpl(
+ proxy.getApplicationAttempts(null, requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -158,11 +160,11 @@ public class ApplicationHistoryProtocolP
@Override
public GetContainerReportResponse getContainerReport(
GetContainerReportRequest request) throws YarnException, IOException {
- GetContainerReportRequestProto requestProto = ((GetContainerReportRequestPBImpl) request)
- .getProto();
+ GetContainerReportRequestProto requestProto =
+ ((GetContainerReportRequestPBImpl) request).getProto();
try {
return new GetContainerReportResponsePBImpl(proxy.getContainerReport(
- null, requestProto));
+ null, requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -172,11 +174,11 @@ public class ApplicationHistoryProtocolP
@Override
public GetContainersResponse getContainers(GetContainersRequest request)
throws YarnException, IOException {
- GetContainersRequestProto requestProto = ((GetContainersRequestPBImpl) request)
- .getProto();
+ GetContainersRequestProto requestProto =
+ ((GetContainersRequestPBImpl) request).getProto();
try {
return new GetContainersResponsePBImpl(proxy.getContainers(null,
- requestProto));
+ requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -185,8 +187,7 @@ public class ApplicationHistoryProtocolP
@Override
public GetDelegationTokenResponse getDelegationToken(
- GetDelegationTokenRequest request) throws YarnException,
- IOException {
+ GetDelegationTokenRequest request) throws YarnException, IOException {
GetDelegationTokenRequestProto requestProto =
((GetDelegationTokenRequestPBImpl) request).getProto();
try {
@@ -200,13 +201,12 @@ public class ApplicationHistoryProtocolP
@Override
public RenewDelegationTokenResponse renewDelegationToken(
- RenewDelegationTokenRequest request) throws YarnException,
- IOException {
- RenewDelegationTokenRequestProto requestProto =
+ RenewDelegationTokenRequest request) throws YarnException, IOException {
+ RenewDelegationTokenRequestProto requestProto =
((RenewDelegationTokenRequestPBImpl) request).getProto();
try {
return new RenewDelegationTokenResponsePBImpl(proxy.renewDelegationToken(
- null, requestProto));
+ null, requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);
return null;
@@ -215,13 +215,12 @@ public class ApplicationHistoryProtocolP
@Override
public CancelDelegationTokenResponse cancelDelegationToken(
- CancelDelegationTokenRequest request) throws YarnException,
- IOException {
+ CancelDelegationTokenRequest request) throws YarnException, IOException {
CancelDelegationTokenRequestProto requestProto =
((CancelDelegationTokenRequestPBImpl) request).getProto();
try {
return new CancelDelegationTokenResponsePBImpl(
- proxy.cancelDelegationToken(null, requestProto));
+ proxy.cancelDelegationToken(null, requestProto));
} catch (ServiceException e) {
RPCUtil.unwrapAndThrowException(e);