Author: zjshen
Date: Thu Jan 9 06:10:07 2014
New Revision: 1556727
URL: http://svn.apache.org/r1556727
Log:
YARN-975. Added a file-system implementation for HistoryStorage. Contributed by
Zhijie Shen.
svn merge --ignore-ancestry -c 1536942 ../../branches/YARN-321-old/
Added:
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/FileSystemApplicationHistoryStore.java
- copied unchanged from r1536942,
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/FileSystemApplicationHistoryStore.java
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
- copied unchanged from r1536942,
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
Modified:
hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
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=1556727&r1=1556726&r2=1556727&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
06:10:07 2014
@@ -425,6 +425,9 @@ Branch YARN-321: Generic ApplicationHist
YARN-1007. Enhance History Reader interface for Containers. (Mayank Bansal
via
devaraj)
+ YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen
+ via vinodkv)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1556727&r1=1556726&r2=1556727&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
(original)
+++
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Thu Jan 9 06:10:07 2014
@@ -929,6 +929,19 @@ public class YarnConfiguration extends C
YARN_PREFIX + "app.container.log.filesize";
////////////////////////////////
+ // AHS Configs
+ ////////////////////////////////
+
+ public static final String AHS_PREFIX = YARN_PREFIX + "ahs.";
+
+ /** URI for FileSystemApplicationHistoryStore */
+ public static final String FS_HISTORY_STORE_URI = AHS_PREFIX +
"fs-history-store.uri";
+
+ /** T-file compression types used to compress history data.*/
+ public static final String FS_HISTORY_STORE_COMPRESSION_TYPE = AHS_PREFIX +
"fs-history-store.compression-type";
+ public static final String DEFAULT_FS_HISTORY_STORE_COMPRESSION_TYPE =
"none";
+
+ ////////////////////////////////
// Other Configs
////////////////////////////////
Modified:
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1556727&r1=1556726&r2=1556727&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
(original)
+++
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Thu Jan 9 06:10:07 2014
@@ -1022,6 +1022,23 @@
<value>$HADOOP_CONF_DIR,$HADOOP_COMMON_HOME/share/hadoop/common/*,$HADOOP_COMMON_HOME/share/hadoop/common/lib/*,$HADOOP_HDFS_HOME/share/hadoop/hdfs/*,$HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/*,$HADOOP_YARN_HOME/share/hadoop/yarn/*,$HADOOP_YARN_HOME/share/hadoop/yarn/lib/*</value>
</property>
+ <!-- Application History Service's Configuration-->
+
+ <property>
+ <description>URI pointing to the location of the FileSystem path where
+ the history will be persisted. This must be supplied when using
+
org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
+ as the value for yarn.resourcemanager.ahs.writer.class</description>
+ <name>yarn.ahs.fs-history-store.uri</name>
+ <value>${hadoop.log.dir}/yarn/system/ahstore</value>
+ </property>
+
+ <property>
+ <description>T-file compression types used to compress history
data.</description>
+ <name>yarn.ahs.fs-history-store.compression-type</name>
+ <value>none</value>
+ </property>
+
<!-- Other configuration -->
<property>
<description>The interval that the yarn client library uses to poll the
