Repository: ambari Updated Branches: refs/heads/trunk f11f0b3f8 -> dd9cb4ee5
AMBARI-5804. ATS start failed with custom usernames (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd9cb4ee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd9cb4ee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd9cb4ee Branch: refs/heads/trunk Commit: dd9cb4ee5b9746aa51e42d7f81e7218d03db1514 Parents: f11f0b3 Author: Andrew Onishuk <[email protected]> Authored: Mon May 19 21:09:20 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon May 19 21:09:20 2014 +0300 ---------------------------------------------------------------------- .../YARN/package/scripts/application_timeline_server.py | 2 +- .../stacks/HDP/2.0.6/services/YARN/package/scripts/params.py | 1 + .../stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py | 5 +++++ ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 3 ++- ambari-server/src/test/python/stacks/2.0.6/configs/secured.json | 3 ++- .../src/test/python/stacks/2.1/YARN/test_apptimelineserver.py | 4 ++++ ambari-server/src/test/python/stacks/2.1/configs/default.json | 3 ++- ambari-server/src/test/python/stacks/2.1/configs/secured.json | 3 ++- 8 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py index 0719da8..d66f2f6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py @@ -33,7 +33,7 @@ class ApplicationTimelineServer(Script): def configure(self, env): import params env.set_params(params) - yarn() + yarn(name='apptimelineserver') def start(self, env): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py index c34a536..d097fa9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py @@ -52,6 +52,7 @@ yarn_heapsize = config['configurations']['global']['yarn_heapsize'] resourcemanager_heapsize = config['configurations']['global']['resourcemanager_heapsize'] nodemanager_heapsize = config['configurations']['global']['nodemanager_heapsize'] apptimelineserver_heapsize = default("/configurations/global/apptimelineserver_heapsize", 1024) +ats_leveldb_dir = config['configurations']['yarn-site']['yarn.timeline-service.leveldb-timeline-store.path'] yarn_log_dir_prefix = config['configurations']['global']['yarn_log_dir_prefix'] yarn_pid_dir_prefix = status_params.yarn_pid_dir_prefix mapred_pid_dir_prefix = status_params.mapred_pid_dir_prefix http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py index a09a6d6..142626d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py @@ -114,6 +114,11 @@ def yarn(name = None): owner=params.yarn_user, group=params.user_group ) + elif name == 'apptimelineserver': + Directory(params.ats_leveldb_dir, + owner=params.yarn_user, + group=params.user_group + ) File(params.rm_nodes_exclude_path, owner=params.yarn_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 3f5220e..f2d40e9 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -483,7 +483,8 @@ "yarn.log.server.url": "http://c6402.ambari.apache.org:19888/jobhistory/logs";, "yarn.application.classpath": "/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*", "yarn.resourcemanager.admin.address": "c6402.ambari.apache.org:8141", - "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler" + "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler", + "yarn.timeline-service.leveldb-timeline-store.path": "/var/log/hadoop-yarn/timeline" }, "tez-site": { "tez.am.log.level": "WARN", http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index 12de853..d594eea 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json @@ -613,7 +613,8 @@ "yarn.resourcemanager.admin.address": "c6402.ambari.apache.org:8141", "yarn.resourcemanager.webapp.spnego-keytab-file": "/etc/security/keytabs/spnego.service.keytab", "yarn.resourcemanager.keytab": "/etc/security/keytabs/rm.service.keytab", - "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler" + "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler", + "yarn.timeline-service.leveldb-timeline-store.path": "/var/log/hadoop-yarn/timeline" }, "hdfs-log4j": { "content": "log4jproperties\nline2" http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index fc0559d..78ae5b8 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -142,6 +142,10 @@ class TestAppTimelineServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['capacity-scheduler'], ) + self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/timeline', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', owner = 'yarn', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/test/python/stacks/2.1/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json index fdac02a..50c72ea 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json @@ -520,7 +520,8 @@ "yarn.log.server.url": "http://c6402.ambari.apache.org:19888/jobhistory/logs";, "yarn.application.classpath": "/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*", "yarn.resourcemanager.admin.address": "c6402.ambari.apache.org:8141", - "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler" + "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler", + "yarn.timeline-service.leveldb-timeline-store.path": "/var/log/hadoop-yarn/timeline" }, "tez-site": { "tez.am.log.level": "WARN", http://git-wip-us.apache.org/repos/asf/ambari/blob/dd9cb4ee/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index 8e76ef5..3dfeb0f 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json @@ -660,7 +660,8 @@ "yarn.resourcemanager.admin.address": "c6402.ambari.apache.org:8141", "yarn.resourcemanager.webapp.spnego-keytab-file": "/etc/security/keytabs/spnego.service.keytab", "yarn.resourcemanager.keytab": "/etc/security/keytabs/rm.service.keytab", - "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler" + "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler", + "yarn.timeline-service.leveldb-timeline-store.path": "/var/log/hadoop-yarn/timeline" }, "hdfs-log4j": { "property1": "value1"
