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/


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

hadoop-yarn-project/CHANGES.txt

@@ -13,6 +13,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

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml

@@ -1141,7 +1141,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>
@@ -1190,7 +1190,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>