You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/02/05 10:29:58 UTC
git commit: AMBARI-4512 Add unittest for Log4j changes (dsen)
Updated Branches:
refs/heads/trunk 60c338b28 -> a12ea1ec8
AMBARI-4512 Add unittest for Log4j changes (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a12ea1ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a12ea1ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a12ea1ec
Branch: refs/heads/trunk
Commit: a12ea1ec828b7337ceeea363719a2dc1d0be02ce
Parents: 60c338b
Author: Dmitry Sen <ds...@hortonworks.com>
Authored: Wed Feb 5 11:29:41 2014 +0200
Committer: Dmitry Sen <ds...@hortonworks.com>
Committed: Wed Feb 5 11:29:41 2014 +0200
----------------------------------------------------------------------
.../stacks/1.3.2/HBASE/test_hbase_client.py | 22 ++++---
.../stacks/1.3.2/HBASE/test_hbase_master.py | 24 +++++---
.../1.3.2/HBASE/test_hbase_regionserver.py | 24 +++++---
.../stacks/1.3.2/HIVE/test_hive_client.py | 32 ++++++++++
.../stacks/1.3.2/HIVE/test_hive_metastore.py | 64 ++++++++++++++++++++
.../stacks/1.3.2/HIVE/test_hive_server.py | 64 ++++++++++++++++++++
.../1.3.2/ZOOKEEPER/test_zookeeper_client.py | 22 ++++---
.../1.3.2/ZOOKEEPER/test_zookeeper_server.py | 22 ++++---
.../python/stacks/1.3.2/configs/default.json | 18 ++++++
.../python/stacks/1.3.2/configs/secured.json | 18 ++++++
.../hooks/before-START/test_before_start.py | 12 ++--
.../stacks/2.0.6/HBASE/test_hbase_client.py | 22 ++++---
.../stacks/2.0.6/HBASE/test_hbase_master.py | 26 +++++---
.../2.0.6/HBASE/test_hbase_regionserver.py | 24 +++++---
.../stacks/2.0.6/HIVE/test_hive_client.py | 32 ++++++++++
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 48 +++++++++++++++
.../stacks/2.0.6/HIVE/test_hive_server.py | 64 ++++++++++++++++++++
.../2.0.6/ZOOKEEPER/test_zookeeper_client.py | 22 ++++---
.../2.0.6/ZOOKEEPER/test_zookeeper_server.py | 26 +++++---
.../python/stacks/2.0.6/configs/default.json | 38 +++++++++++-
.../python/stacks/2.0.6/configs/secured.json | 39 +++++++++++-
.../hooks/before-START/test_before_start.py | 12 ++--
.../python/stacks/2.1.1/configs/default.json | 38 +++++++++++-
.../python/stacks/2.1.1/configs/secured.json | 36 +++++++++++
24 files changed, 647 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
index eb6f3cb..f226616 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
@@ -67,10 +67,13 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
self.assertNoMoreResources()
@@ -114,10 +117,13 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
index 402d8aa..c3789a2 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
@@ -111,7 +111,7 @@ class TestHBaseMaster(RMFTestCase):
command = "configure",
config_file="secured.json"
)
-
+
self.assert_configure_secured()
self.assertNoMoreResources()
@@ -209,10 +209,13 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
def assert_configure_secured(self):
@@ -265,8 +268,11 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
index 84b5625..35a6403 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
@@ -143,10 +143,13 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
@@ -200,8 +203,11 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
- )
\ No newline at end of file
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
index 6355b9c..d1610d6 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
@@ -56,6 +56,22 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
)
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
@@ -94,4 +110,20 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
)
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
index 0d30b8c..c970cc8 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
@@ -29,6 +29,22 @@ class TestHiveMetastore(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_default(self):
@@ -39,6 +55,22 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
user = 'hive'
@@ -67,6 +99,22 @@ class TestHiveMetastore(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_secured(self):
@@ -77,6 +125,22 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_secured()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
user = 'hive'
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
index 60d4722..43a8cdf 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
@@ -29,6 +29,22 @@ class TestHiveServer(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_default(self):
@@ -39,6 +55,22 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',
user = 'hive'
@@ -68,6 +100,22 @@ class TestHiveServer(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_secured()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_secured(self):
@@ -78,6 +126,22 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_secured()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',
user = 'hive'
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
index 97def8c..f7de9f9 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
@@ -64,10 +64,13 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
@@ -118,10 +121,13 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
owner = 'zookeeper',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
index 1ceedb9..81df5e7 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
@@ -139,10 +139,13 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
@@ -190,10 +193,13 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
owner = 'zookeeper',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/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 6d12470..a4d74c3 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
@@ -347,6 +347,24 @@
"hive.auto.convert.sortmerge.join.noconditionaltask": "true",
"hive.server2.enable.doAs": "true",
"hive.optimize.mapjoin.mapreduce": "true"
+ },
+ "hdfs-log4j": {
+ "property1": "value1"
+ },
+ "yarn-log4j": {
+ "property1": "value1"
+ },
+ "hbase-log4j": {
+ "property1": "value1"
+ },
+ "hive-log4j": {
+ "property1": "value1"
+ },
+ "hive-exec-log4j": {
+ "property1": "value1"
+ },
+ "zookeeper-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index 9520b02..3f19af8 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
@@ -452,6 +452,24 @@
"hive.server2.enable.doAs": "true",
"hive.optimize.mapjoin.mapreduce": "true",
"hive.server2.authentication.kerberos.keytab": "/etc/security/keytabs/hive.service.keytab"
+ },
+ "hdfs-log4j": {
+ "property1": "value1"
+ },
+ "yarn-log4j": {
+ "property1": "value1"
+ },
+ "hbase-log4j": {
+ "property1": "value1"
+ },
+ "hive-log4j": {
+ "property1": "value1"
+ },
+ "hive-exec-log4j": {
+ "property1": "value1"
+ },
+ "zookeeper-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
index d440437..d3b7788 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
@@ -96,13 +96,13 @@ class TestHookBeforeStart(RMFTestCase):
content = Template('health_check.j2'),
owner = 'hdfs',
)
-
- self.assertResourceCalled('File', '/etc/hadoop/conf/log4j.properties',
- owner = 'hdfs',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ '/etc/hadoop/conf/log4j.properties',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hdfs',
+ group='hadoop'
)
-
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~ambari.jobhistory.driver=org.postgresql.Driver~' /etc/hadoop/conf/log4j.properties",
)
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index 340026a..b0d4d31 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -67,10 +67,13 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
self.assertNoMoreResources()
@@ -114,10 +117,13 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index 6959141..c8e61d6 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -31,7 +31,7 @@ class TestHBaseMaster(RMFTestCase):
self.assert_configure_default()
self.assertNoMoreResources()
-
+
def test_start_default(self):
self.executeScript("2.0.6/services/HBASE/package/scripts/hbase_master.py",
classname = "HbaseMaster",
@@ -209,10 +209,13 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
def assert_configure_secured(self):
@@ -265,8 +268,11 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
- )
\ No newline at end of file
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
index 14913c2..231ae94 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
@@ -142,10 +142,13 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
)
def assert_configure_secured(self):
@@ -198,8 +201,11 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
- owner = 'hbase',
- group = 'hadoop',
- mode = 420,
- )
\ No newline at end of file
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/hbase/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hbase',
+ group='hadoop'
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
index 83f322c..ec3c895 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
@@ -57,6 +57,22 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
)
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
@@ -96,4 +112,20 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
)
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
index 7ef2249..c08a260 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
@@ -38,6 +38,22 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
user = 'hive'
@@ -66,6 +82,22 @@ class TestHiveMetastore(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_secured(self):
@@ -76,6 +108,22 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_secured()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
user = 'hive'
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index f5a5288..3971000 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -29,6 +29,22 @@ class TestHiveServer(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_default(self):
@@ -39,6 +55,22 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_default()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',
user = 'hive'
@@ -68,6 +100,22 @@ class TestHiveServer(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_secured()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertNoMoreResources()
def test_start_secured(self):
@@ -78,6 +126,22 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_secured()
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-exec-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
+ self.assertResourceCalled('PropertiesFile',
+ 'hive-log4j.properties',
+ dir='/etc/hive/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hive',
+ group='hadoop'
+ )
self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',
user = 'hive'
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
index 93ba686..db1b883 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
@@ -65,10 +65,13 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
@@ -119,10 +122,13 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
owner = 'zookeeper',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
index fb6e617..f5ac3eb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
@@ -136,11 +136,14 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
- )
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
group = 'hadoop',
@@ -186,11 +189,14 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
- self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
- owner = 'zookeeper',
- group = 'hadoop',
- mode = 420,
- )
+ self.assertResourceCalled('PropertiesFile',
+ 'log4j.properties',
+ dir='/etc/zookeeper/conf',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='zookeeper',
+ group='hadoop'
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
owner = 'zookeeper',
content = Template('zookeeper_jaas.conf.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/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 f1ce054..611645e 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
@@ -488,8 +488,26 @@
"tez.lib.uris": "file:///usr/lib/tez/,file:///usr/lib/tez/lib/",
"tez.staging-dir": "/tmp/${user.name}/staging",
"tez.am.am-rm.heartbeat.interval-ms.max": "250"
+ },
+ "hdfs-log4j": {
+ "property1": "value1"
+ },
+ "yarn-log4j": {
+ "property1": "value1"
+ },
+ "hbase-log4j": {
+ "property1": "value1"
+ },
+ "hive-log4j": {
+ "property1": "value1"
+ },
+ "hive-exec-log4j": {
+ "property1": "value1"
+ },
+ "zookeeper-log4j": {
+ "property1": "value1"
}
- },
+ },
"configurationTags": {
"capacity-scheduler": {
"tag": "version1"
@@ -523,6 +541,24 @@
},
"hive-site": {
"tag": "version1"
+ },
+ "hdfs-log4j": {
+ "tag": "version1"
+ },
+ "yarn-log4j": {
+ "tag": "version1"
+ },
+ "hbase-log4j": {
+ "tag": "version1"
+ },
+ "hive-log4j": {
+ "tag": "version1"
+ },
+ "hive-exec-log4j": {
+ "tag": "version1"
+ },
+ "zookeeper-log4j": {
+ "tag": "version1"
}
},
"commandId": "7-1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/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 8477faa..e10f4ee 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
@@ -615,6 +615,24 @@
"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"
+ },
+ "hdfs-log4j": {
+ "property1": "value1"
+ },
+ "yarn-log4j": {
+ "property1": "value1"
+ },
+ "hbase-log4j": {
+ "property1": "value1"
+ },
+ "hive-log4j": {
+ "property1": "value1"
+ },
+ "hive-exec-log4j": {
+ "property1": "value1"
+ },
+ "zookeeper-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
@@ -650,8 +668,27 @@
},
"hive-site": {
"tag": "version1389972945450"
+ },
+ "hdfs-log4j": {
+ "tag": "version1389972945450"
+ },
+ "yarn-log4j": {
+ "tag": "version1389972945450"
+ },
+ "hbase-log4j": {
+ "tag": "version1389972945450"
+ },
+ "hive-log4j": {
+ "tag": "version1389972945450"
+ },
+ "hive-exec-log4j": {
+ "tag": "version1389972945450"
+ },
+ "zookeeper-log4j": {
+ "tag": "version1389972945450"
}
- },
+
+ },
"commandId": "9-1",
"clusterHostInfo": {
"snamenode_host": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
index 392cf40..6045f39 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
@@ -100,13 +100,13 @@ class TestHookBeforeStart(RMFTestCase):
content = Template('health_check-v2.j2'),
owner = 'hdfs',
)
-
- self.assertResourceCalled('File', '/etc/hadoop/conf/log4j.properties',
- owner = 'hdfs',
- group = 'hadoop',
- mode = 420,
+ self.assertResourceCalled('PropertiesFile',
+ '/etc/hadoop/conf/log4j.properties',
+ properties={'property1': 'value1'},
+ mode=0664,
+ owner='hdfs',
+ group='hadoop'
)
-
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~###ambari.jobhistory.driver=o~' /etc/hadoop/conf/log4j.properties",
)
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~###log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
index f1ce054..611645e 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
@@ -488,8 +488,26 @@
"tez.lib.uris": "file:///usr/lib/tez/,file:///usr/lib/tez/lib/",
"tez.staging-dir": "/tmp/${user.name}/staging",
"tez.am.am-rm.heartbeat.interval-ms.max": "250"
+ },
+ "hdfs-log4j": {
+ "property1": "value1"
+ },
+ "yarn-log4j": {
+ "property1": "value1"
+ },
+ "hbase-log4j": {
+ "property1": "value1"
+ },
+ "hive-log4j": {
+ "property1": "value1"
+ },
+ "hive-exec-log4j": {
+ "property1": "value1"
+ },
+ "zookeeper-log4j": {
+ "property1": "value1"
}
- },
+ },
"configurationTags": {
"capacity-scheduler": {
"tag": "version1"
@@ -523,6 +541,24 @@
},
"hive-site": {
"tag": "version1"
+ },
+ "hdfs-log4j": {
+ "tag": "version1"
+ },
+ "yarn-log4j": {
+ "tag": "version1"
+ },
+ "hbase-log4j": {
+ "tag": "version1"
+ },
+ "hive-log4j": {
+ "tag": "version1"
+ },
+ "hive-exec-log4j": {
+ "tag": "version1"
+ },
+ "zookeeper-log4j": {
+ "tag": "version1"
}
},
"commandId": "7-1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12ea1ec/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
index 8477faa..c4f9a37 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
@@ -615,6 +615,24 @@
"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"
+ },
+ "hdfs-log4j": {
+ "property1": "value1"
+ },
+ "yarn-log4j": {
+ "property1": "value1"
+ },
+ "hbase-log4j": {
+ "property1": "value1"
+ },
+ "hive-log4j": {
+ "property1": "value1"
+ },
+ "hive-exec-log4j": {
+ "property1": "value1"
+ },
+ "zookeeper-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
@@ -650,6 +668,24 @@
},
"hive-site": {
"tag": "version1389972945450"
+ },
+ "hdfs-log4j": {
+ "tag": "version1389972945450"
+ },
+ "yarn-log4j": {
+ "tag": "version1389972945450"
+ },
+ "hbase-log4j": {
+ "tag": "version1389972945450"
+ },
+ "hive-log4j": {
+ "tag": "version1389972945450"
+ },
+ "hive-exec-log4j": {
+ "tag": "version1389972945450"
+ },
+ "zookeeper-log4j": {
+ "tag": "version1389972945450"
}
},
"commandId": "9-1",