Browse Source

YARN-956. Added a testable in-memory HistoryStorage. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1556721 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562178 13f79535-47bb-0310-9956-ffa450edef68

Vinod Kumar Vavilapalli 11 years ago
parent
commit
5f61991d0d

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -471,6 +471,9 @@ Branch YARN-321: Generic ApplicationHistoryService
 
   YARN-978. Created ApplicationAttemptReport. (Mayank Bansal via vinodkv)
 
+  YARN-956. Added a testable in-memory HistoryStorage. (Mayank Bansal via
+  vinodkv)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

+ 20 - 10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java

@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.applicationhistoryservice;
 
+import java.io.IOException;
 import java.util.Map;
 
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -34,19 +35,22 @@ import org.apache.hadoop.yarn.server.applicationhistoryservice.records.Container
 public interface ApplicationHistoryReader {
 
   /**
-   * This method returns Application {@link ApplicationHistoryData} for the specified
-   * {@link ApplicationId}.
+   * This method returns Application {@link ApplicationHistoryData} for the
+   * specified {@link ApplicationId}.
    * 
    * @return {@link ApplicationHistoryData} for the ApplicationId.
+   * @throws {@link IOException}
    */
-   ApplicationHistoryData getApplication(ApplicationId appId);
+  ApplicationHistoryData getApplication(ApplicationId appId) throws IOException;
 
   /**
    * This method returns all Application {@link ApplicationHistoryData}s
    * 
    * @return map {@link ApplicationId, @link ApplicationHistoryData}s.
+   * @throws {@link IOException}
    */
-  Map<ApplicationId, ApplicationHistoryData> getAllApplications();
+  Map<ApplicationId, ApplicationHistoryData> getAllApplications()
+      throws IOException;
 
   /**
    * Application can have multiple application attempts
@@ -54,9 +58,10 @@ public interface ApplicationHistoryReader {
    * {@link ApplicationAttemptHistoryData}s for the Application.
    * 
    * @return all {@link ApplicationAttemptHistoryData}s for the Application.
+   * @throws {@link IOException}
    */
   Map<ApplicationAttemptId, ApplicationAttemptHistoryData> getApplicationAttempts(
-      ApplicationId appId);
+      ApplicationId appId) throws IOException;
 
   /**
    * This method returns {@link ApplicationAttemptHistoryData} for specified
@@ -64,17 +69,20 @@ public interface ApplicationHistoryReader {
    * 
    * @param {@link ApplicationAttemptId}
    * @return {@link ApplicationAttemptHistoryData} for ApplicationAttemptId
+   * @throws {@link IOException}
    */
   ApplicationAttemptHistoryData getApplicationAttempt(
-      ApplicationAttemptId appAttemptId);
+      ApplicationAttemptId appAttemptId) throws IOException;
 
   /**
-   * This method returns {@link Container} for specified {@link ContainerId}.
+   * This method returns {@link ContainerHistoryData} for specified
+   * {@link ContainerId}.
    * 
    * @param {@link ContainerId}
-   * @return {@link Container} for ContainerId
+   * @return {@link ContainerHistoryData} for ContainerId
+   * @throws {@link IOException}
    */
-  ContainerHistoryData getAMContainer(ContainerId containerId);
+  ContainerHistoryData getContainer(ContainerId containerId) throws IOException;
 
   /**
    * This method returns {@link ContainerHistoryData} for specified
@@ -82,6 +90,8 @@ public interface ApplicationHistoryReader {
    * 
    * @param {@link ApplicationAttemptId}
    * @return {@link ContainerHistoryData} for ApplicationAttemptId
+   * @throws {@link IOException}
    */
-  ContainerHistoryData getContainer(ApplicationAttemptId appAttemptId);
+  ContainerHistoryData getAMContainer(ApplicationAttemptId appAttemptId)
+      throws IOException;
 }