From cee917ace9a43ec463d0bc9f61598d73d7c35bbf Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Tue, 28 Jan 2014 19:57:00 +0000 Subject: [PATCH] YARN-1266. Implemented PB service and client wrappers for ApplicationHistoryProtocol. Contributed by Mayank Bansal. svn merge --ignore-ancestry -c 1556739 ../YARN-321 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562193 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java | 2 +- .../server/applicationhistoryservice/AHSClientService.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 51d65a8a5b7..39513e041c8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -496,6 +496,9 @@ Branch YARN-321: Generic ApplicationHistoryService YARN-953. Changed ResourceManager to start writing history data. (Zhijie Shen via vinodkv) + YARN-1266. Implemented PB service and client wrappers for + ApplicationHistoryProtocol. (Mayank Bansal via vinodkv) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java index b10a1adb485..e8390639c8d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationHistoryProtocol.java @@ -202,7 +202,7 @@ public interface ApplicationHistoryProtocol { */ @Public @Unstable - public GetContainerReportResponse getContainer( + public GetContainerReportResponse getContainerReport( GetContainerReportRequest request) throws YarnException, IOException; /** diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/AHSClientService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/AHSClientService.java index cf6ccc5ef2e..35cfecfff6b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/AHSClientService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/AHSClientService.java @@ -100,7 +100,7 @@ public class AHSClientService extends AbstractService implements } @Override - public GetContainerReportResponse getContainer( + public GetContainerReportResponse getContainerReport( GetContainerReportRequest request) throws YarnException, IOException { // TODO Auto-generated method stub return null;