You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sj...@apache.org on 2015/12/10 22:05:42 UTC
[1/2] hadoop git commit: YARN-3623. Add a config to indicate the
Timeline Service version. Contributed by Xuan Gong.
Repository: hadoop
Updated Branches:
refs/heads/feature-YARN-2928 cdb96df97 -> b4a3b50cc
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/b8a2df17
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b8a2df17
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b8a2df17
Branch: refs/heads/feature-YARN-2928
Commit: b8a2df17f7c1f7449fcb0f54d40d242b73631d05
Parents: cdb96df
Author: Junping Du <ju...@apache.org>
Authored: Thu Dec 10 02:44:30 2015 -0800
Committer: Sangjin Lee <sj...@apache.org>
Committed: Thu Dec 10 13:04:32 2015 -0800
----------------------------------------------------------------------
.../apache/hadoop/yarn/conf/YarnConfiguration.java | 3 +++
.../src/main/resources/yarn-default.xml | 14 ++++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8a2df17/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 7f568a6..0165593 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
@@ -1569,6 +1569,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/b8a2df17/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 adc28f0..125560d 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
@@ -1776,6 +1776,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>
[2/2] hadoop git commit: YARN-3623-Addendum: Improve the description
for Timeline Service Version configuration in yarn-default.xml
Posted by sj...@apache.org.
YARN-3623-Addendum: Improve the description for Timeline Service Version configuration in yarn-default.xml
(cherry picked from commit 21daa6c68a0bff51a14e748bf14d56b2f5a5580f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4a3b50c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4a3b50c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4a3b50c
Branch: refs/heads/feature-YARN-2928
Commit: b4a3b50cc9f5f9f6d7f766fb641090b2287da330
Parents: b8a2df1
Author: Xuan <xg...@apache.org>
Authored: Thu Dec 10 10:56:12 2015 -0800
Committer: Sangjin Lee <sj...@apache.org>
Committed: Thu Dec 10 13:04:54 2015 -0800
----------------------------------------------------------------------
.../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4a3b50c/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 125560d..99f84e6 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
@@ -1779,7 +1779,7 @@
<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).
+ should bring up the timeline service v.1.5.
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,