You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/02/22 00:22:24 UTC
[2/2] git commit: AMBARI-4678. Custom log4j configs should be stored
as raw text. (Dmitry Sen via mahadev)
AMBARI-4678. Custom log4j configs should be stored as raw text. (Dmitry Sen via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dfe1fe04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dfe1fe04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dfe1fe04
Branch: refs/heads/trunk
Commit: dfe1fe043d031b7299106826e854ebd97a112e0a
Parents: 60ea8da
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Feb 21 15:22:15 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Feb 21 15:22:15 2014 -0800
----------------------------------------------------------------------
.../1.3.2/hooks/before-START/scripts/params.py | 40 +++++----
.../scripts/shared_initialization.py | 22 ++---
.../services/HBASE/package/scripts/hbase.py | 11 ++-
.../services/HBASE/package/scripts/params.py | 6 +-
.../1.3.2/services/HIVE/package/scripts/hive.py | 22 +++--
.../services/HIVE/package/scripts/params.py | 10 +--
.../services/OOZIE/package/scripts/oozie.py | 11 ++-
.../services/OOZIE/package/scripts/params.py | 6 +-
.../services/PIG/package/scripts/params.py | 4 +-
.../1.3.2/services/PIG/package/scripts/pig.py | 11 ++-
.../ZOOKEEPER/package/scripts/params.py | 4 +-
.../ZOOKEEPER/package/scripts/zookeeper.py | 9 +-
.../2.0.6/hooks/before-START/scripts/params.py | 25 +-----
.../scripts/shared_initialization.py | 21 ++---
.../services/HBASE/package/scripts/hbase.py | 11 ++-
.../services/HBASE/package/scripts/params.py | 4 +-
.../2.0.6/services/HIVE/package/scripts/hive.py | 22 +++--
.../services/HIVE/package/scripts/params.py | 10 +--
.../services/OOZIE/package/scripts/oozie.py | 9 +-
.../services/OOZIE/package/scripts/params.py | 4 +-
.../services/PIG/package/scripts/params.py | 4 +-
.../2.0.6/services/PIG/package/scripts/pig.py | 9 +-
.../ZOOKEEPER/package/scripts/params.py | 4 +-
.../ZOOKEEPER/package/scripts/zookeeper.py | 11 ++-
.../stacks/1.3.2/HBASE/test_hbase_client.py | 22 +++--
.../stacks/1.3.2/HBASE/test_hbase_master.py | 22 +++--
.../1.3.2/HBASE/test_hbase_regionserver.py | 22 +++--
.../stacks/1.3.2/HIVE/test_hive_client.py | 44 +++++-----
.../stacks/1.3.2/HIVE/test_hive_metastore.py | 88 +++++++++-----------
.../stacks/1.3.2/HIVE/test_hive_server.py | 88 +++++++++-----------
.../stacks/1.3.2/OOZIE/test_oozie_client.py | 26 +++---
.../stacks/1.3.2/OOZIE/test_oozie_server.py | 40 ++++-----
.../python/stacks/1.3.2/PIG/test_pig_client.py | 20 ++---
.../1.3.2/ZOOKEEPER/test_zookeeper_client.py | 26 +++---
.../1.3.2/ZOOKEEPER/test_zookeeper_server.py | 26 +++---
.../python/stacks/1.3.2/configs/default.json | 42 ++++++++--
.../python/stacks/1.3.2/configs/secured.json | 40 +++++++--
.../hooks/before-START/test_before_start.py | 75 +++++------------
.../stacks/2.0.6/HBASE/test_hbase_client.py | 22 +++--
.../stacks/2.0.6/HBASE/test_hbase_master.py | 22 +++--
.../2.0.6/HBASE/test_hbase_regionserver.py | 22 +++--
.../stacks/2.0.6/HIVE/test_hive_client.py | 44 +++++-----
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 66 +++++++--------
.../stacks/2.0.6/HIVE/test_hive_server.py | 88 +++++++++-----------
.../stacks/2.0.6/OOZIE/test_oozie_client.py | 20 ++---
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 14 ++--
.../python/stacks/2.0.6/PIG/test_pig_client.py | 20 ++---
.../2.0.6/ZOOKEEPER/test_zookeeper_client.py | 26 +++---
.../2.0.6/ZOOKEEPER/test_zookeeper_server.py | 26 +++---
.../python/stacks/2.0.6/configs/default.json | 22 +++--
.../python/stacks/2.0.6/configs/secured.json | 23 +++--
.../hooks/before-START/test_before_start.py | 69 +++------------
52 files changed, 604 insertions(+), 751 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py
index e602895..4ad49dd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py
@@ -176,26 +176,24 @@ if dfs_ha_enabled:
dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None)
#log4j.properties
-rca_property_map = {
- 'ambari.jobhistory.database': ambari_db_rca_url,
- 'ambari.jobhistory.driver': ambari_db_rca_driver,
- 'ambari.jobhistory.user': ambari_db_rca_username,
- 'ambari.jobhistory.password': ambari_db_rca_password,
- 'ambari.jobhistory.logger': 'DEBUG,JHA',
-
- 'log4j.appender.JHA': 'org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender',
- 'log4j.appender.JHA.database': '${ambari.jobhistory.database}',
- 'log4j.appender.JHA.driver': '${ambari.jobhistory.driver}',
- 'log4j.appender.JHA.user': '${ambari.jobhistory.user}',
- 'log4j.appender.JHA.password': '${ambari.jobhistory.password}',
-
- 'log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': '${ambari.jobhistory.logger}',
- 'log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': 'true'
-}
-
-if ('hdfs-log4j' in config['configurations']):
- log4j_props = config['configurations']['hdfs-log4j']
- if 'mapreduce-log4j' in config['configurations']:
- log4j_props.update(config['configurations']['mapreduce-log4j'])
+rca_properties = format('''
+
+log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender
+log4j.appender.JHA.database={ambari_db_rca_url}
+log4j.appender.JHA.driver={ambari_db_rca_driver}
+log4j.appender.JHA.user={ambari_db_rca_username}
+log4j.appender.JHA.password={ambari_db_rca_password}
+
+log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=DEBUG,JHA
+log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true
+
+''')
+
+if (('hdfs-log4j' in config['configurations']) and ('content' in config['configurations']['hdfs-log4j'])):
+ log4j_props = config['configurations']['hdfs-log4j']['content']
+ if (('mapreduce-log4j' in config['configurations']) and ('content' in config['configurations']['mapreduce-log4j'])):
+ log4j_props += config['configurations']['mapreduce-log4j']['content']
+ if rca_enabled:
+ log4j_props += rca_properties
else:
log4j_props = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
index d6521ee..89b29c6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
@@ -143,11 +143,11 @@ def setup_hadoop():
log4j_filename = os.path.join(params.hadoop_conf_dir, "log4j.properties")
if (params.log4j_props != None):
- PropertiesFile(log4j_filename,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hdfs_user,
- group=params.user_group,
+ File(log4j_filename,
+ mode=0644,
+ group=params.user_group,
+ owner=params.hdfs_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.hadoop_conf_dir}/log4j.properties"))):
File(log4j_filename,
@@ -156,8 +156,6 @@ def setup_hadoop():
owner=params.hdfs_user,
)
- update_log4j_props(log4j_filename)
-
File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
owner=params.hdfs_user,
content=Template("hadoop-metrics2.properties.j2")
@@ -277,16 +275,6 @@ def setup_configs():
# generate_include_file()
-def update_log4j_props(file):
- import params
-
- for key in params.rca_property_map:
- value = params.rca_property_map[key]
- Execute(format(
- "sed -i 's~\\({rca_disabled_prefix}\\)\\?{key}=.*~{rca_prefix}{key}={value}~' {file}")
- )
-
-
def generate_include_file():
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
index c140a6d..2e802f5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
@@ -100,12 +100,11 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
)
if (params.log4j_props != None):
- PropertiesFile('log4j.properties',
- dir=params.conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hbase_user,
- group=params.user_group,
+ File(format("{params.conf_dir}/log4j.properties"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hbase_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.conf_dir}/log4j.properties"))):
File(format("{params.conf_dir}/log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
index b207d4f..54f3990 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
@@ -95,8 +95,8 @@ else:
kinit_cmd = ""
#log4j.properties
-if ('hbase-log4j' in config['configurations']):
- log4j_props = config['configurations']['hbase-log4j']
+if (('hbase-log4j' in config['configurations']) and ('content' in config['configurations']['hbase-log4j'])):
+ log4j_props = config['configurations']['hbase-log4j']['content']
else:
log4j_props = None
@@ -119,4 +119,4 @@ HdfsDirectory = functools.partial(
security_enabled = security_enabled,
keytab = hdfs_user_keytab,
kinit_path_local = kinit_path_local
-)
\ No newline at end of file
+)
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
index 38fb498..30aec45 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
@@ -95,12 +95,11 @@ def hive(name=None):
log4j_exec_filename = 'hive-exec-log4j.properties'
if (params.log4j_exec_props != None):
- PropertiesFile(log4j_exec_filename,
- dir=params.hive_conf_dir,
- properties=params.log4j_exec_props,
- mode=0664,
- owner=params.hive_user,
- group=params.user_group
+ File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hive_user,
+ content=params.log4j_exec_props
)
elif (os.path.exists("{params.hive_conf_dir}/{log4j_exec_filename}.template")):
File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
@@ -112,12 +111,11 @@ def hive(name=None):
log4j_filename = 'hive-log4j.properties'
if (params.log4j_props != None):
- PropertiesFile(log4j_filename,
- dir=params.hive_conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hive_user,
- group=params.user_group
+ File(format("{params.hive_conf_dir}/{log4j_filename}"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hive_user,
+ content=params.log4j_props
)
elif (os.path.exists("{params.hive_conf_dir}/{log4j_filename}.template")):
File(format("{params.hive_conf_dir}/{log4j_filename}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py
index b999aec..c429555 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py
@@ -124,14 +124,14 @@ hcat_log_dir = config['configurations']['global']['hcat_log_dir'] #hcat_log_di
hadoop_conf_dir = '/etc/hadoop/conf'
#hive-log4j.properties.template
-if ('hive-log4j' in config['configurations']):
- log4j_props = config['configurations']['hive-log4j']
+if (('hive-log4j' in config['configurations']) and ('content' in config['configurations']['hive-log4j'])):
+ log4j_props = config['configurations']['hive-log4j']['content']
else:
log4j_props = None
#hive-exec-log4j.properties.template
-if ('hive-exec-log4j' in config['configurations']):
- log4j_exec_props = config['configurations']['hive-exec-log4j']
+if (('hive-exec-log4j' in config['configurations']) and ('content' in config['configurations']['hive-exec-log4j'])):
+ log4j_exec_props = config['configurations']['hive-exec-log4j']['content']
else:
log4j_exec_props = None
@@ -157,4 +157,4 @@ HdfsDirectory = functools.partial(
security_enabled = security_enabled,
keytab = hdfs_user_keytab,
kinit_path_local = kinit_path_local
-)
\ No newline at end of file
+)
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
index 151a1f8..e2336ef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
@@ -29,12 +29,11 @@ def oozie(is_server=False
)
if (params.log4j_props != None):
- PropertiesFile('oozie-log4j.properties',
- dir=params.conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.oozie_user,
- group=params.user_group,
+ File(format("{params.conf_dir}/oozie-log4j.properties"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.oozie_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.conf_dir}/oozie-log4j.properties"))):
File(format("{params.conf_dir}/oozie-log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
index 517ee73..047f74b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
@@ -65,8 +65,8 @@ else:
jar_path = "{lzo_jar_suffix}{jdbc_driver_jar}"
#oozie-log4j.properties
-if ('oozie-log4j' in config['configurations']):
- log4j_props = config['configurations']['oozie-log4j']
+if (('oozie-log4j' in config['configurations']) and ('content' in config['configurations']['oozie-log4j'])):
+ log4j_props = config['configurations']['oozie-log4j']['content']
else:
log4j_props = None
@@ -89,4 +89,4 @@ HdfsDirectory = functools.partial(
security_enabled = security_enabled,
keytab = hdfs_user_keytab,
kinit_path_local = kinit_path_local
-)
\ No newline at end of file
+)
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/params.py
index 3cd60d2..ab52cac 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/params.py
@@ -40,7 +40,7 @@ java64_home = config['hostLevelParams']['java_home']
hadoop_home = "/usr"
#log4j.properties
-if ('pig-log4j' in config['configurations']):
- log4j_props = config['configurations']['pig-log4j']
+if (('pig-log4j' in config['configurations']) and ('content' in config['configurations']['pig-log4j'])):
+ log4j_props = config['configurations']['pig-log4j']['content']
else:
log4j_props = None
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/pig.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/pig.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/pig.py
index 0450d5e..7bf6927 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/pig.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/pig.py
@@ -34,12 +34,11 @@ def pig():
pig_TemplateConfig( ['pig-env.sh','pig.properties'])
if (params.log4j_props != None):
- PropertiesFile('log4j.properties',
- dir=params.pig_conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hdfs_user,
- group=params.user_group,
+ File(format("{params.pig_conf_dir}/log4j.properties"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hdfs_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.pig_conf_dir}/log4j.properties"))):
File(format("{params.pig_conf_dir}/log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
index 60fa5da..c6a560e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
@@ -72,7 +72,7 @@ smokeuser = config['configurations']['global']['smokeuser']
kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
#log4j.properties
-if ('zookeeper-log4j' in config['configurations']):
- log4j_props = config['configurations']['zookeeper-log4j']
+if (('zookeeper-log4j' in config['configurations']) and ('content' in config['configurations']['zookeeper-log4j'])):
+ log4j_props = config['configurations']['zookeeper-log4j']['content']
else:
log4j_props = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/zookeeper.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/zookeeper.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/zookeeper.py
index 7b74b4c..23db950 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/zookeeper.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/zookeeper.py
@@ -65,12 +65,11 @@ def zookeeper(type = None):
)
if (params.log4j_props != None):
- PropertiesFile('log4j.properties',
- dir=params.config_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.zk_user,
+ File(format("{params.config_dir}/log4j.properties"),
+ mode=0644,
group=params.user_group,
+ owner=params.zk_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.config_dir}/log4j.properties"))):
File(format("{params.config_dir}/log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index 85ee2b9..185cca7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -178,26 +178,9 @@ if dfs_ha_enabled:
dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None)
#log4j.properties
-rca_property_map = {
- 'ambari.jobhistory.database': ambari_db_rca_url,
- 'ambari.jobhistory.driver': ambari_db_rca_driver,
- 'ambari.jobhistory.user': ambari_db_rca_username,
- 'ambari.jobhistory.password': ambari_db_rca_password,
- 'ambari.jobhistory.logger': 'DEBUG,JHA',
-
- 'log4j.appender.JHA': 'org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender',
- 'log4j.appender.JHA.database': '${ambari.jobhistory.database}',
- 'log4j.appender.JHA.driver': '${ambari.jobhistory.driver}',
- 'log4j.appender.JHA.user': '${ambari.jobhistory.user}',
- 'log4j.appender.JHA.password': '${ambari.jobhistory.password}',
-
- 'log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': '${ambari.jobhistory.logger}',
- 'log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': 'true'
-}
-
-if ('hdfs-log4j' in config['configurations']):
- log4j_props = config['configurations']['hdfs-log4j']
- if 'yarn-log4j' in config['configurations']:
- log4j_props.update(config['configurations']['yarn-log4j'])
+if (('hdfs-log4j' in config['configurations']) and ('content' in config['configurations']['hdfs-log4j'])):
+ log4j_props = config['configurations']['hdfs-log4j']['content']
+ if (('yarn-log4j' in config['configurations']) and ('content' in config['configurations']['yarn-log4j'])):
+ log4j_props += config['configurations']['yarn-log4j']['content']
else:
log4j_props = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index 2f2ca8b..a8d2fa3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -147,11 +147,11 @@ def setup_hadoop():
log4j_filename = os.path.join(params.hadoop_conf_dir, "log4j.properties")
if (params.log4j_props != None):
- PropertiesFile(log4j_filename,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hdfs_user,
- group=params.user_group,
+ File(log4j_filename,
+ mode=0644,
+ group=params.user_group,
+ owner=params.hdfs_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.hadoop_conf_dir}/log4j.properties"))):
File(log4j_filename,
@@ -160,8 +160,6 @@ def setup_hadoop():
owner=params.hdfs_user,
)
- update_log4j_props(log4j_filename)
-
File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
owner=params.hdfs_user,
content=Template("hadoop-metrics2.properties.j2")
@@ -282,15 +280,6 @@ def setup_configs():
generate_include_file()
-def update_log4j_props(file):
- import params
-
- for key in params.rca_property_map:
- value = params.rca_property_map[key]
- Execute(format(
- "sed -i 's~\\({rca_disabled_prefix}\\)\\?{key}=.*~{rca_prefix}{key}={value}~' {file}")
- )
-
def generate_include_file():
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
index d899d17..d890339 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
@@ -98,12 +98,11 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
)
if (params.log4j_props != None):
- PropertiesFile('log4j.properties',
- dir=params.conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hbase_user,
- group=params.user_group,
+ File(format("{params.conf_dir}/log4j.properties"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hbase_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.conf_dir}/log4j.properties"))):
File(format("{params.conf_dir}/log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
index a91e10e..ecdb843 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
@@ -94,8 +94,8 @@ else:
kinit_cmd = ""
#log4j.properties
-if ('hbase-log4j' in config['configurations']):
- log4j_props = config['configurations']['hbase-log4j']
+if (('hbase-log4j' in config['configurations']) and ('content' in config['configurations']['hbase-log4j'])):
+ log4j_props = config['configurations']['hbase-log4j']['content']
else:
log4j_props = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
index 94b0a45..01fd2f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
@@ -95,12 +95,11 @@ def hive(name=None):
log4j_exec_filename = 'hive-exec-log4j.properties'
if (params.log4j_exec_props != None):
- PropertiesFile(log4j_exec_filename,
- dir=params.hive_conf_dir,
- properties=params.log4j_exec_props,
- mode=0664,
- owner=params.hive_user,
- group=params.user_group
+ File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hive_user,
+ content=params.log4j_exec_props
)
elif (os.path.exists("{params.hive_conf_dir}/{log4j_exec_filename}.template")):
File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
@@ -112,12 +111,11 @@ def hive(name=None):
log4j_filename = 'hive-log4j.properties'
if (params.log4j_props != None):
- PropertiesFile(log4j_filename,
- dir=params.hive_conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hive_user,
- group=params.user_group
+ File(format("{params.hive_conf_dir}/{log4j_filename}"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.hive_user,
+ content=params.log4j_props
)
elif (os.path.exists("{params.hive_conf_dir}/{log4j_filename}.template")):
File(format("{params.hive_conf_dir}/{log4j_filename}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
index d201832..24998d8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
@@ -128,14 +128,14 @@ hcat_log_dir = config['configurations']['global']['hcat_log_dir']
hadoop_conf_dir = '/etc/hadoop/conf'
#hive-log4j.properties.template
-if ('hive-log4j' in config['configurations']):
- log4j_props = config['configurations']['hive-log4j']
+if (('hive-log4j' in config['configurations']) and ('content' in config['configurations']['hive-log4j'])):
+ log4j_props = config['configurations']['hive-log4j']['content']
else:
log4j_props = None
#hive-exec-log4j.properties.template
-if ('hive-exec-log4j' in config['configurations']):
- log4j_exec_props = config['configurations']['hive-exec-log4j']
+if (('hive-exec-log4j' in config['configurations']) and ('content' in config['configurations']['hive-exec-log4j'])):
+ log4j_exec_props = config['configurations']['hive-exec-log4j']['content']
else:
log4j_exec_props = None
@@ -170,4 +170,4 @@ HdfsDirectory = functools.partial(
security_enabled = security_enabled,
keytab = hdfs_user_keytab,
kinit_path_local = kinit_path_local
-)
\ No newline at end of file
+)
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
index 2efe535..fd3572b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
@@ -51,12 +51,11 @@ def oozie(is_server=False # TODO: see if see can remove this
)
if (params.log4j_props != None):
- PropertiesFile('oozie-log4j.properties',
- dir=params.conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.oozie_user,
+ File(format("{params.conf_dir}/oozie-log4j.properties"),
+ mode=0644,
group=params.user_group,
+ owner=params.oozie_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.conf_dir}/oozie-log4j.properties"))):
File(format("{params.conf_dir}/oozie-log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
index dc52b39..235d1a9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
@@ -78,8 +78,8 @@ has_falcon_host = not len(falcon_host) == 0
falcon_home = '/usr/lib/falcon'
#oozie-log4j.properties
-if ('oozie-log4j' in config['configurations']):
- log4j_props = config['configurations']['oozie-log4j']
+if (('oozie-log4j' in config['configurations']) and ('content' in config['configurations']['oozie-log4j'])):
+ log4j_props = config['configurations']['oozie-log4j']['content']
else:
log4j_props = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py
index 3cd60d2..ab52cac 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py
@@ -40,7 +40,7 @@ java64_home = config['hostLevelParams']['java_home']
hadoop_home = "/usr"
#log4j.properties
-if ('pig-log4j' in config['configurations']):
- log4j_props = config['configurations']['pig-log4j']
+if (('pig-log4j' in config['configurations']) and ('content' in config['configurations']['pig-log4j'])):
+ log4j_props = config['configurations']['pig-log4j']['content']
else:
log4j_props = None
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/pig.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/pig.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/pig.py
index d8aadf7..bf0ccd9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/pig.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/pig.py
@@ -34,12 +34,11 @@ def pig():
pig_TemplateConfig( ['pig-env.sh','pig.properties'])
if (params.log4j_props != None):
- PropertiesFile('log4j.properties',
- dir=params.pig_conf_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.hdfs_user,
+ File(format("{params.pig_conf_dir}/log4j.properties"),
+ mode=0644,
group=params.user_group,
+ owner=params.hdfs_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.pig_conf_dir}/log4j.properties"))):
File(format("{params.pig_conf_dir}/log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
index 60fa5da..c6a560e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
@@ -72,7 +72,7 @@ smokeuser = config['configurations']['global']['smokeuser']
kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
#log4j.properties
-if ('zookeeper-log4j' in config['configurations']):
- log4j_props = config['configurations']['zookeeper-log4j']
+if (('zookeeper-log4j' in config['configurations']) and ('content' in config['configurations']['zookeeper-log4j'])):
+ log4j_props = config['configurations']['zookeeper-log4j']['content']
else:
log4j_props = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper.py
index ac69829..c900043 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper.py
@@ -65,12 +65,11 @@ def zookeeper(type = None):
)
if (params.log4j_props != None):
- PropertiesFile('log4j.properties',
- dir=params.config_dir,
- properties=params.log4j_props,
- mode=0664,
- owner=params.zk_user,
- group=params.user_group,
+ File(format("{params.config_dir}/log4j.properties"),
+ mode=0644,
+ group=params.user_group,
+ owner=params.zk_user,
+ content=params.log4j_props
)
elif (os.path.exists(format("{params.config_dir}/log4j.properties"))):
File(format("{params.config_dir}/log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 5ef19c3..4e6da7d 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
@@ -71,13 +71,12 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/hbase/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hbase/conf/log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hbase',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
@@ -125,13 +124,12 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/hbase/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hbase/conf/log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hbase',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 1d1baca..4eb7d50 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
@@ -236,13 +236,12 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/hbase/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hbase/conf/log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hbase',
- group='hadoop'
+ content='log4jproperties\nline2'
)
def assert_configure_secured(self):
@@ -322,11 +321,10 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/hbase/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hbase/conf/log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hbase',
- group='hadoop'
+ content='log4jproperties\nline2'
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 a031b04..1ee8abd 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
@@ -170,13 +170,12 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/hbase/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hbase/conf/log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hbase',
- group='hadoop'
+ content='log4jproperties\nline2'
)
@@ -257,11 +256,10 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/hbase/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hbase/conf/log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hbase',
- group='hadoop'
+ content='log4jproperties\nline2'
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 99bef52..80a3c5c 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,21 +56,19 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-exec-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
@@ -110,20 +108,18 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-exec-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 89a6808..479f88c 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,21 +29,19 @@ 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,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
@@ -55,21 +53,19 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_default()
- self.assertResourceCalled('PropertiesFile',
- 'hive-exec-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
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',
@@ -99,21 +95,19 @@ 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,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
@@ -125,21 +119,19 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_secured()
- self.assertResourceCalled('PropertiesFile',
- 'hive-exec-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
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',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 b92f543..a48eadf 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,21 +29,19 @@ 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,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
@@ -55,21 +53,19 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_default()
- self.assertResourceCalled('PropertiesFile',
- 'hive-exec-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
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',
@@ -100,21 +96,19 @@ 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,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
self.assertNoMoreResources()
@@ -126,21 +120,19 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_secured()
- self.assertResourceCalled('PropertiesFile',
- 'hive-exec-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-exec-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
- self.assertResourceCalled('PropertiesFile',
- 'hive-log4j.properties',
- dir='/etc/hive/conf',
- properties={'property1': 'value1'},
- mode=0664,
+ self.assertResourceCalled('File',
+ '/etc/hive/conf/hive-log4j.properties',
+ mode=0644,
+ group='hadoop',
owner='hive',
- group='hadoop'
+ content='log4jproperties\nline2'
)
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',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
index eed555d..fa9996c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
@@ -42,13 +42,12 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
- self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
- owner = 'oozie',
- group = 'hadoop',
- mode = 0664,
- dir = '/etc/oozie/conf',
- properties = self.getConfig()['configurations']['oozie-log4j'],
- )
+ self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0644,
+ content = 'log4jproperties\nline2'
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -92,13 +91,12 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
- self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
- owner = 'oozie',
- group = 'hadoop',
- mode = 0664,
- dir = '/etc/oozie/conf',
- properties = self.getConfig()['configurations']['oozie-log4j'],
- )
+ self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0644,
+ content = 'log4jproperties\nline2'
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
index b70dda3..6f8d72a 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
@@ -52,13 +52,12 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
- self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
- owner = 'oozie',
- group = 'hadoop',
- mode = 0664,
- dir = '/etc/oozie/conf',
- properties = self.getConfig()['configurations']['oozie-log4j'],
- )
+ self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0644,
+ content = 'log4jproperties\nline2'
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -190,13 +189,12 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
- self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
- owner = 'oozie',
- group = 'hadoop',
- mode = 0664,
- dir = '/etc/oozie/conf',
- properties = self.getConfig()['configurations']['oozie-log4j'],
- )
+ self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0644,
+ content = 'log4jproperties\nline2'
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -322,12 +320,11 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
- self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
owner = 'oozie',
group = 'hadoop',
- mode = 0664,
- dir = '/etc/oozie/conf',
- properties = self.getConfig()['configurations']['oozie-log4j'],
+ mode = 0644,
+ content = 'log4jproperties\nline2'
)
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
@@ -418,12 +415,11 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
- self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
owner = 'oozie',
group = 'hadoop',
- mode = 0664,
- dir = '/etc/oozie/conf',
- properties = self.getConfig()['configurations']['oozie-log4j'],
+ mode = 0644,
+ content = 'log4jproperties\nline2'
)
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py b/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
index 1856be6..3fdf73b 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
@@ -20,7 +20,7 @@ limitations under the License.
from stacks.utils.RMFTestCase import *
-class TestPigClient(RMFTestCase):
+class TestHcatClient(RMFTestCase):
def test_configure_default(self):
self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
@@ -28,6 +28,7 @@ class TestPigClient(RMFTestCase):
command = "configure",
config_file="default.json"
)
+
self.assertResourceCalled('Directory', '/etc/pig/conf',
owner = 'hdfs',
group = 'hadoop',
@@ -38,23 +39,21 @@ class TestPigClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
owner = 'hdfs',
)
- self.assertResourceCalled('PropertiesFile', 'log4j.properties',
+ self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
owner = 'hdfs',
group = 'hadoop',
- mode = 0664,
- dir = '/etc/pig/conf',
- properties = self.getConfig()['configurations']['pig-log4j'],
+ mode = 0644,
+ content = 'log4jproperties\nline2'
)
self.assertNoMoreResources()
-
-
def test_configure_secured(self):
self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
classname = "PigClient",
command = "configure",
config_file="secured.json"
)
+
self.assertResourceCalled('Directory', '/etc/pig/conf',
owner = 'hdfs',
group = 'hadoop',
@@ -65,11 +64,10 @@ class TestPigClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
owner = 'hdfs',
)
- self.assertResourceCalled('PropertiesFile', 'log4j.properties',
+ self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
owner = 'hdfs',
group = 'hadoop',
- mode = 0664,
- dir = '/etc/pig/conf',
- properties = self.getConfig()['configurations']['pig-log4j'],
+ mode = 0644,
+ content = 'log4jproperties\nline2'
)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 f7de9f9..0cb6b71 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,13 +64,12 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/zookeeper/conf',
- properties={'property1': 'value1'},
- mode=0664,
- owner='zookeeper',
- group='hadoop'
+ self.assertResourceCalled('File',
+ '/etc/zookeeper/conf/log4j.properties',
+ content='log4jproperties\nline2',
+ mode=0644,
+ group='hadoop',
+ owner='zookeeper'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
@@ -121,13 +120,12 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/zookeeper/conf',
- properties={'property1': 'value1'},
- mode=0664,
- owner='zookeeper',
- group='hadoop'
+ self.assertResourceCalled('File',
+ '/etc/zookeeper/conf/log4j.properties',
+ content='log4jproperties\nline2',
+ mode=0644,
+ group='hadoop',
+ owner='zookeeper'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
owner = 'zookeeper',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 711df2d..d84c068 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,13 +139,12 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 0644,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/zookeeper/conf',
- properties={'property1': 'value1'},
- mode=0664,
- owner='zookeeper',
- group='hadoop'
+ self.assertResourceCalled('File',
+ '/etc/zookeeper/conf/log4j.properties',
+ content='log4jproperties\nline2',
+ mode=0644,
+ group='hadoop',
+ owner='zookeeper'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
@@ -193,13 +192,12 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 0644,
)
- self.assertResourceCalled('PropertiesFile',
- 'log4j.properties',
- dir='/etc/zookeeper/conf',
- properties={'property1': 'value1'},
- mode=0664,
- owner='zookeeper',
- group='hadoop'
+ self.assertResourceCalled('File',
+ '/etc/zookeeper/conf/log4j.properties',
+ content='log4jproperties\nline2',
+ mode=0644,
+ group='hadoop',
+ owner='zookeeper'
)
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
owner = 'zookeeper',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 70a3132..854b8c9 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
@@ -351,28 +351,28 @@
"hive.optimize.mapjoin.mapreduce": "true"
},
"hdfs-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
- "yarn-log4j": {
- "property1": "value1"
+ "mapreduce-log4j": {
+ "content": "log4jproperties\nline2"
},
"hbase-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"hive-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"hive-exec-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"zookeeper-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"pig-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"oozie-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
}
},
"configurationTags": {
@@ -399,6 +399,30 @@
},
"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"
+ },
+ "oozie-log4j": {
+ "tag": "version1"
+ },
+ "pig-log4j": {
+ "tag": "version1"
}
},
"commandId": "1-1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe1fe04/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 7e3d39d..93f8247 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
@@ -456,28 +456,28 @@
"hive.server2.authentication.kerberos.keytab": "/etc/security/keytabs/hive.service.keytab"
},
"hdfs-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"yarn-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"hbase-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"hive-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"hive-exec-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"zookeeper-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"pig-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
},
"oozie-log4j": {
- "property1": "value1"
+ "content": "log4jproperties\nline2"
}
},
"configurationTags": {
@@ -504,6 +504,30 @@
},
"hive-site": {
"tag": "version1389980437965"
+ },
+ "hdfs-log4j": {
+ "tag": "version1389980437965"
+ },
+ "yarn-log4j": {
+ "tag": "version1389980437965"
+ },
+ "hbase-log4j": {
+ "tag": "version1389980437965"
+ },
+ "hive-log4j": {
+ "tag": "version1389980437965"
+ },
+ "hive-exec-log4j": {
+ "tag": "version1389980437965"
+ },
+ "zookeeper-log4j": {
+ "tag": "version1389980437965"
+ },
+ "oozie-log4j": {
+ "tag": "version1389980437965"
+ },
+ "pig-log4j": {
+ "tag": "version1389980437965"
}
},
"commandId": "4-2",