hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sj...@apache.org
Subject hadoop git commit: YARN-4183. Clarify the behavior of timeline service config properties (Naganarasimha G R via sjlee)
Date Thu, 31 Mar 2016 17:53:08 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 480b01ba9 -> 856a131c6


YARN-4183. Clarify the behavior of timeline service config properties (Naganarasimha G R via
sjlee)

(cherry picked from commit 6d67420dbc5c6097216fa40fcec8ed626b2bae14)


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

Branch: refs/heads/branch-2.7
Commit: 856a131c6585dff6be7db2c41d5f8b765a31a4a8
Parents: 480b01b
Author: Sangjin Lee <sjlee@apache.org>
Authored: Thu Mar 31 10:49:03 2016 -0700
Committer: Sangjin Lee <sjlee@apache.org>
Committed: Thu Mar 31 10:52:39 2016 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                        |  3 +++
 .../src/main/resources/yarn-default.xml                | 13 ++++++++++---
 .../src/site/markdown/TimelineServer.md                |  6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/856a131c/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 33b07ad..74bcdda 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -110,6 +110,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4785. inconsistent value type of the "type" field for LeafQueueInfo 
     in response of RM REST API. (Varun Vasudev via junping_du)
 
+    YARN-4183. Clarify the behavior of timeline service config properties
+    (Naganarasimha G R via sjlee)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/856a131c/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 efd6a90..55abd12 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
@@ -1319,8 +1319,12 @@
   <!-- Timeline Service's Configuration-->
 
   <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>
+    In the server side it indicates whether timeline service is enabled or not.
+    And in the client side, users can enable it to indicate whether client wants
+    to use timeline service. If it's enabled in the client side along with
+    security, then yarn client tries to fetch the delegation tokens for the
+    timeline server.
     </description>
     <name>yarn.timeline-service.enabled</name>
     <value>false</value>
@@ -1472,7 +1476,10 @@
   </property>
 
   <property>
-    <description>Client policy for whether timeline operations are non-fatal</description>
+    <description>Client policy for whether timeline operations are non-fatal.
+    Should the failure to obtain a delegation token be considered an application
+    failure (option = false),  or should the client attempt to continue to
+    publish information without it (option=true)</description>
     <name>yarn.timeline-service.client.best-effort</name>
     <value>false</value>
   </property>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/856a131c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
index e31622b..f3473f0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
@@ -137,7 +137,7 @@ and cluster operators.
 
 | Configuration Property | Description |
 |:---- |:---- |
-| `yarn.timeline-service.enabled` | Indicate to clients whether Timeline service is enabled
or not. If enabled, the `TimelineClient` library used by applications will post entities and
events to the Timeline server. Defaults to `false`. |
+| `yarn.timeline-service.enabled` | In the server side it indicates whether timeline service
is enabled or not. And in the client side, users can enable it to indicate whether client
wants to use timeline service. If it's enabled in the client side along with security, then
yarn client tries to fetch the delegation tokens for the timeline server. Defaults to `false`.
|
 | `yarn.resourcemanager.system-metrics-publisher.enabled` | The setting that controls whether
or not YARN system metrics are published on the timeline server by RM. Defaults to `false`.
|
 | `yarn.timeline-service.generic-application-history.enabled` | Indicate to clients whether
to query generic application data from timeline history-service or not. If not enabled then
application data is queried only from Resource Manager. Defaults to `false`. |
 
@@ -146,7 +146,7 @@ and cluster operators.
 | Configuration Property | Description |
 |:---- |:---- |
 | `yarn.timeline-service.store-class` | Store class name for timeline store. Defaults to
`org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore`. |
-| `yarn.timeline-service.leveldb-timeline-store.path` | Store file name for leveldb timeline
store. Defaults to `${hadoop.tmp.dir}/yarn/timelin`e. |
+| `yarn.timeline-service.leveldb-timeline-store.path` | Store file name for leveldb timeline
store. Defaults to `${hadoop.tmp.dir}/yarn/timeline`. |
 | `yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms` | Length of time to wait
between deletion cycles of leveldb timeline store in milliseconds. Defaults to `300000`. |
 | `yarn.timeline-service.leveldb-timeline-store.read-cache-size` | Size of read cache for
uncompressed blocks for leveldb timeline store in bytes. Defaults to `104857600`. |
 | `yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size` | Size of cache
for recently read entity start times for leveldb timeline store in number of entities. Defaults
to `10000`. |
@@ -211,7 +211,7 @@ to `kerberos`, after which the following configuration options are available:
 | `yarn.timeline-service.delegation.key.update-interval` | Defaults to `86400000` (1 day).
|
 | `yarn.timeline-service.delegation.token.renew-interval` | Defaults to `86400000` (1 day).
|
 | `yarn.timeline-service.delegation.token.max-lifetime` | Defaults to `604800000` (7 days).
|
-| `yarn.timeline-service.best-effort` | Should the failure to obtain a delegation token be
considered an application failure (option = false),  or should the client attempt to continue
to publish information without it (option=true). Default: `false` |
+| `yarn.timeline-service.client.best-effort` | Should the failure to obtain a delegation
token be considered an application failure (option = false),  or should the client attempt
to continue to publish information without it (option=true). Default: `false` |
 
 #### Enabling the timeline service and the generic history service
 


Mime
View raw message