You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/09/03 17:26:55 UTC
git commit: AMBARI-7115. Stack Service Pluggability: Adding service
to a stack requires editing hooks folder (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk df34b3a7a -> c76d1ef46
AMBARI-7115. Stack Service Pluggability: Adding service to a stack requires editing hooks folder (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c76d1ef4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c76d1ef4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c76d1ef4
Branch: refs/heads/trunk
Commit: c76d1ef462ce9c6f7f2d16d8996ff01127dde4f2
Parents: df34b3a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Sep 3 18:25:40 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Sep 3 18:26:47 2014 +0300
----------------------------------------------------------------------
.../python/stacks/1.3.2/configs/default.json | 4 +-
.../hooks/before-INSTALL/test_before_install.py | 83 ++++++++++-------
.../python/stacks/2.0.6/configs/default.json | 5 +-
.../hooks/before-INSTALL/test_before_install.py | 98 ++++++++++----------
4 files changed, 102 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c76d1ef4/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index c6bbdc6..4a42faa 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
@@ -17,7 +17,9 @@
"jdk_name": "jdk-7u45-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
"java_home": "/usr/jdk64/jdk1.7.0_45",
- "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+ "group_list": "[\"hadoop\",\"nobody\",\"users\",\"nagios\"]",
+ "user_list": "[\"hive\",\"oozie\",\"nobody\",\"nagios\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
http://git-wip-us.apache.org/repos/asf/ambari/blob/c76d1ef4/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
index 25f85e9..a2d808b 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
@@ -50,93 +50,108 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('Group', 'hadoop',
ignore_failures = False,
)
- self.assertResourceCalled('Group', 'users',
+ self.assertResourceCalled('Group', 'nobody',
ignore_failures = False,
)
self.assertResourceCalled('Group', 'users',
ignore_failures = False,
)
- self.assertResourceCalled('User', 'ambari-qa',
- gid = 'hadoop',
+ self.assertResourceCalled('Group', 'nagios',
ignore_failures = False,
- groups = [u'users'],
- )
- self.assertResourceCalled('File', '/tmp/changeUid.sh',
- content = StaticFile('changeToSecureUid.sh'),
- mode = 0555,
)
- self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
- not_if = 'test $(id -u ambari-qa) -gt 1000',
- )
- self.assertResourceCalled('User', 'hbase',
+ self.assertResourceCalled('User', 'hive',
gid = 'hadoop',
ignore_failures = False,
groups = [u'hadoop'],
)
- self.assertResourceCalled('File', '/tmp/changeUid.sh',
- content = StaticFile('changeToSecureUid.sh'),
- mode = 0555,
- )
- self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
- not_if = 'test $(id -u hbase) -gt 1000',
+ self.assertResourceCalled('User', 'oozie',
+ gid = 'hadoop',
+ ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('Group', 'nagios',
+ self.assertResourceCalled('User', 'nobody',
+ gid = 'hadoop',
ignore_failures = False,
+ groups = [u'nobody'],
)
self.assertResourceCalled('User', 'nagios',
gid = 'nagios',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'oozie',
+ self.assertResourceCalled('User', 'ambari-qa',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'users'],
)
- self.assertResourceCalled('User', 'hcat',
+ self.assertResourceCalled('User', 'flume',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'hcat',
+ self.assertResourceCalled('User', 'hdfs',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'hive',
+ self.assertResourceCalled('User', 'storm',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('Group', 'nobody',
+ self.assertResourceCalled('User', 'mapred',
+ gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('Group', 'nobody',
+ self.assertResourceCalled('User', 'hbase',
+ gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'nobody',
+ self.assertResourceCalled('User', 'tez',
gid = 'hadoop',
ignore_failures = False,
- groups = [u'nobody'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'nobody',
+ self.assertResourceCalled('User', 'zookeeper',
gid = 'hadoop',
ignore_failures = False,
- groups = [u'nobody'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'hdfs',
+ self.assertResourceCalled('User', 'falcon',
gid = 'hadoop',
ignore_failures = False,
groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'mapred',
+ self.assertResourceCalled('User', 'sqoop',
gid = 'hadoop',
ignore_failures = False,
groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'zookeeper',
+ self.assertResourceCalled('User', 'yarn',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'sqoop',
+ self.assertResourceCalled('User', 'hcat',
gid = 'hadoop',
ignore_failures = False,
- groups = ['hadoop'],
+ groups = [u'hadoop'],
+ )
+ self.assertResourceCalled('File', '/tmp/changeUid.sh',
+ content = StaticFile('changeToSecureUid.sh'),
+ mode = 0555,
+ )
+ self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
+ not_if = 'test $(id -u ambari-qa) -gt 1000',
+ )
+ self.assertResourceCalled('File', '/tmp/changeUid.sh',
+ content = StaticFile('changeToSecureUid.sh'),
+ mode = 0555,
+ )
+ self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
+ not_if = 'test $(id -u hbase) -gt 1000',
)
self.assertResourceCalled('Package', 'unzip',)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/c76d1ef4/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 b68780c..0a48d49 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
@@ -14,7 +14,9 @@
"jdk_name": "jdk-7u45-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
"java_home": "/usr/jdk64/jdk1.7.0_45",
- "db_name": "ambari"
+ "db_name": "ambari",
+ "group_list": "[\"hadoop\",\"nobody\",\"users\",\"nagios\"]",
+ "user_list": "[\"hive\",\"oozie\",\"nobody\",\"nagios\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
@@ -30,7 +32,6 @@
"xml_configs_list":[{"hdfs-site.xml":"hdfs-site"}],
"env_configs_list":[{"hadoop-env.sh":"hadoop-env"},{"log4j.properties":"hdfs-log4j,yarn-log4j"}],
"output_file":"HDFS_CLIENT-configs.tar.gz"
-
},
"taskId": 152,
"public_hostname": "c6401.ambari.apache.org",
http://git-wip-us.apache.org/repos/asf/ambari/blob/c76d1ef4/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
index a26798e..3581556 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
@@ -52,111 +52,107 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('Group', 'hadoop',
ignore_failures = False,
)
- self.assertResourceCalled('Group', 'users',
+ self.assertResourceCalled('Group', 'nobody',
ignore_failures = False,
)
self.assertResourceCalled('Group', 'users',
ignore_failures = False,
)
- self.assertResourceCalled('User', 'ambari-qa',
- gid = 'hadoop',
+ self.assertResourceCalled('Group', 'nagios',
ignore_failures = False,
- groups = [u'users'],
- )
- self.assertResourceCalled('File', '/tmp/changeUid.sh',
- content = StaticFile('changeToSecureUid.sh'),
- mode = 0555,
- )
- self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
- not_if = 'test $(id -u ambari-qa) -gt 1000',
)
- self.assertResourceCalled('User', 'hbase',
+ self.assertResourceCalled('User', 'hive',
gid = 'hadoop',
ignore_failures = False,
groups = [u'hadoop'],
)
- self.assertResourceCalled('File', '/tmp/changeUid.sh',
- content = StaticFile('changeToSecureUid.sh'),
- mode = 0555,
- )
- self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
- not_if = 'test $(id -u hbase) -gt 1000',
- )
- self.assertResourceCalled('Group', 'nagios',
- ignore_failures = False,
- )
- self.assertResourceCalled('User', 'nagios',
- gid = 'nagios',
- ignore_failures = False,
- )
self.assertResourceCalled('User', 'oozie',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'hcat',
+ self.assertResourceCalled('User', 'nobody',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'nobody'],
)
- self.assertResourceCalled('User', 'hcat',
- gid = 'hadoop',
+ self.assertResourceCalled('User', 'nagios',
+ gid = 'nagios',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'hive',
+ self.assertResourceCalled('User', 'ambari-qa',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'users'],
)
- self.assertResourceCalled('User', 'yarn',
+ self.assertResourceCalled('User', 'flume',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('Group', 'nobody',
- ignore_failures = False,
- )
- self.assertResourceCalled('Group', 'nobody',
+ self.assertResourceCalled('User', 'hdfs',
+ gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'nobody',
+ self.assertResourceCalled('User', 'storm',
gid = 'hadoop',
ignore_failures = False,
- groups = ['nobody'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'nobody',
+ self.assertResourceCalled('User', 'mapred',
gid = 'hadoop',
ignore_failures = False,
- groups = ['nobody'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'hdfs',
+ self.assertResourceCalled('User', 'hbase',
gid = 'hadoop',
ignore_failures = False,
- groups = ['hadoop'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'mapred',
+ self.assertResourceCalled('User', 'tez',
gid = 'hadoop',
ignore_failures = False,
- groups = ['hadoop'],
+ groups = [u'users'],
)
self.assertResourceCalled('User', 'zookeeper',
gid = 'hadoop',
ignore_failures = False,
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'storm',
+ self.assertResourceCalled('User', 'falcon',
gid = 'hadoop',
ignore_failures = False,
- groups = ['hadoop'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'falcon',
+ self.assertResourceCalled('User', 'sqoop',
gid = 'hadoop',
ignore_failures = False,
- groups = ['hadoop'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'tez',
+ self.assertResourceCalled('User', 'yarn',
gid = 'hadoop',
ignore_failures = False,
- groups = ['users'],
+ groups = [u'hadoop'],
)
- self.assertResourceCalled('User', 'sqoop',
+ self.assertResourceCalled('User', 'hcat',
gid = 'hadoop',
ignore_failures = False,
- groups = ['hadoop'],
+ groups = [u'hadoop'],
+ )
+ self.assertResourceCalled('File', '/tmp/changeUid.sh',
+ content = StaticFile('changeToSecureUid.sh'),
+ mode = 0555,
+ )
+ self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
+ not_if = 'test $(id -u ambari-qa) -gt 1000',
+ )
+ self.assertResourceCalled('File', '/tmp/changeUid.sh',
+ content = StaticFile('changeToSecureUid.sh'),
+ mode = 0555,
+ )
+ self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
+ not_if = 'test $(id -u hbase) -gt 1000',
)
self.assertNoMoreResources()