Author: zjshen
Date: Fri May 9 04:26:36 2014
New Revision: 1593484
URL: http://svn.apache.org/r1593484
Log:
YARN-1701. Improved default paths of the timeline store and the generic history
store. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1593481 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
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=1593484&r1=1593483&r2=1593484&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Fri May 9
04:26:36 2014
@@ -86,6 +86,9 @@ Release 2.4.1 - UNRELEASED
YARN-1696. Added documentation for ResourceManager fail-over. (Karthik
Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA via vinodkv)
+ YARN-1701. Improved default paths of the timeline store and the generic
+ history store. (Tsuyoshi Ozawa via zjshen)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1593484&r1=1593483&r2=1593484&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Fri May 9 04:26:36 2014
@@ -1161,7 +1161,7 @@
<property>
<description>Store file name for leveldb timeline store.</description>
<name>yarn.timeline-service.leveldb-timeline-store.path</name>
- <value>${yarn.log.dir}/timeline</value>
+ <value>${hadoop.tmp.dir}/yarn/timeline</value>
</property>
<property>
@@ -1210,7 +1210,7 @@
org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
as the value for
yarn.timeline-service.generic-application-history.store-class</description>
<name>yarn.timeline-service.generic-application-history.fs-history-store.uri</name>
- <value>${hadoop.log.dir}/yarn/system/history</value>
+ <value>${hadoop.tmp.dir}/yarn/timeline/generic-history</value>
</property>
<property>
