svn commit: r1556721 - in /hadoop/common/branches/YARN-321/hadoop-yarn-project: ./ hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/

[zjshen]

Author: zjshen
Date: Thu Jan  9 05:00:45 2014
New Revision: 1556721

URL: http://svn.apache.org/r1556721
Log:
YARN-956. Added a testable in-memory HistoryStorage. Contributed by Mayank 
Bansal.
svn merge --ignore-ancestry -c 1509788 ../../branches/YARN-321-old/

Modified:
    hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt
    
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java

Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt?rev=1556721&r1=1556720&r2=1556721&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt Thu Jan  9 
05:00:45 2014
@@ -419,6 +419,9 @@ Branch YARN-321: Generic ApplicationHist
 
   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

Modified: 
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java?rev=1556721&r1=1556720&r2=1556721&view=diff
==============================================================================
--- 
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java
 (original)
+++ 
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryReader.java
 Thu Jan  9 05:00:45 2014
@@ -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.app
 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 ApplicationHistoryReade
    * {@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 ApplicationHistoryReade
    * 
    * @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 ApplicationHistoryReade
    * 
    * @param {@link ApplicationAttemptId}
    * @return {@link ContainerHistoryData} for ApplicationAttemptId
+   * @throws {@link IOException}
    */
-  ContainerHistoryData getContainer(ApplicationAttemptId appAttemptId);
+  ContainerHistoryData getAMContainer(ApplicationAttemptId appAttemptId)
+      throws IOException;
 }