Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 575ed11e2 -> 4d61fa1b1


AMBARI-14715. TimelineServer configuration is missing in yarn-env.xml. (Akira 
Ajisaka via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d61fa1b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d61fa1b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d61fa1b

Branch: refs/heads/branch-2.2
Commit: 4d61fa1b1a004ed34c06209fa5fd1ba69b6b78c9
Parents: 575ed11
Author: Yusaku Sako <yus...@hortonworks.com>
Authored: Thu Feb 11 19:10:13 2016 -0800
Committer: Yusaku Sako <yus...@hortonworks.com>
Committed: Thu Feb 11 19:10:52 2016 -0800

----------------------------------------------------------------------
 .../stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d61fa1b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
index 699463b..74fd4f6 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
@@ -102,14 +102,14 @@
       # or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.
       export YARN_NODEMANAGER_HEAPSIZE={{nodemanager_heapsize}}
 
-      # Specify the max Heapsize for the HistoryManager using a numerical value
+      # Specify the max Heapsize for the timeline server using a numerical 
value
       # in the scale of MB. For example, to specify an jvm option of 
-Xmx1000m, set
       # the value to 1024.
       # This value will be overridden by an Xmx setting specified in either 
YARN_OPTS
-      # and/or YARN_HISTORYSERVER_OPTS.
+      # and/or YARN_TIMELINESERVER_OPTS.
       # If not specified, the default value will be picked from either 
YARN_HEAPMAX
       # or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.
-      export YARN_HISTORYSERVER_HEAPSIZE={{apptimelineserver_heapsize}}
+      export YARN_TIMELINESERVER_HEAPSIZE={{apptimelineserver_heapsize}}
 
       # Specify the JVM options to be used when starting the NodeManager.
       # These options will be appended to the options specified as YARN_OPTS

Reply via email to