diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 0b455e7..ef50aea 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -1161,7 +1161,7 @@
Store file name for leveldb timeline store.
yarn.timeline-service.leveldb-timeline-store.path
- ${yarn.log.dir}/timeline
+ ${hadoop.tmp.dir}/yarn/timeline
@@ -1210,7 +1210,7 @@
org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
as the value for yarn.timeline-service.generic-application-history.store-class
yarn.timeline-service.generic-application-history.fs-history-store.uri
- ${hadoop.log.dir}/yarn/system/history
+ ${hadoop.tmp.dir}/yarn/timeline/generic-history