diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 21535b9..521bb3d 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1538,6 +1538,9 @@ private static void addDeprecatedKeys() {
public static final String TIMELINE_SERVICE_PREFIX =
YARN_PREFIX + "timeline-service.";
+ public static final String TIMELINE_SERVICE_VERSION = TIMELINE_SERVICE_PREFIX
+ + "version";
+ public static final float DEFAULT_TIMELINE_SERVICE_VERSION = 1.0f;
/**
* Comma seperated list of names for UIs hosted in the timeline server
* (For pluggable UIs).
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 c862ef2..0917366 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
@@ -1766,6 +1766,20 @@
+ Indicate what is the current version of the running
+ timeline service. For example, if "yarn.timeline-service.version" is 1.5,
+ and "yarn.timeline-service.enabled" is true, it means the cluster will and
+ should bring up the timeline service v.1.5 (and nothing else).
+ On the client side, if the client uses the same version of timeline service,
+ it should succeed. If the client chooses to use a smaller version in spite of this,
+ then depending on how robust the compatibility story is between versions,
+ the results may vary.
+
+ yarn.timeline-service.version
+ 1.0f
+
+
+
Indicate to clients whether timeline service is enabled or not.
If enabled, clients will put entities and events to the timeline server.