hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From junping...@apache.org
Subject hadoop git commit: YARN-3623. Add a config to indicate the Timeline Service version. Contributed by Xuan Gong. (cherry picked from commit f910e4f639dc311fcb257bfcb869b1aa8b2c0643)
Date Thu, 10 Dec 2015 10:52:01 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 c65a796f8 -> 0b5e76e9f


YARN-3623. Add a config to indicate the Timeline Service version. Contributed by Xuan Gong.
(cherry picked from commit f910e4f639dc311fcb257bfcb869b1aa8b2c0643)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b5e76e9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b5e76e9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b5e76e9

Branch: refs/heads/branch-2
Commit: 0b5e76e9ff14811ad2617e632854f21d82558e5e
Parents: c65a796
Author: Junping Du <junping_du@apache.org>
Authored: Thu Dec 10 02:44:30 2015 -0800
Committer: Junping Du <junping_du@apache.org>
Committed: Thu Dec 10 02:57:46 2015 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                       |  3 +++
 .../apache/hadoop/yarn/conf/YarnConfiguration.java    |  3 +++
 .../src/main/resources/yarn-default.xml               | 14 ++++++++++++++
 3 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b5e76e9/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d4b7001..73eb4ec 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -216,6 +216,9 @@ Release 2.8.0 - UNRELEASED
 
     YARN-4349. Support CallerContext in YARN. (wtan via jianhe)
 
+    YARN-3623. Add a new config to indicate the Timeline Service version. 
+    (Xuan Gong via junping_du)
+
   IMPROVEMENTS
 
     YARN-644. Basic null check is not performed on passed in arguments before

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b5e76e9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 21535b9..521bb3d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1538,6 +1538,9 @@ public class YarnConfiguration extends Configuration {
   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).

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b5e76e9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index c862ef2..0917366 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -1766,6 +1766,20 @@
   <!-- Timeline Service Configuration -->
 
   <property>
+    <description>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.
+    </description>
+    <name>yarn.timeline-service.version</name>
+    <value>1.0f</value>
+  </property>
+
+  <property>
     <description>Indicate to clients whether timeline service is enabled or not.
     If enabled, clients will put entities and events to the timeline server.
     </description>


Mime
View raw message