AMBARI-7017. Jobs aren't displayed in Ambari UI (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af1db651
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af1db651
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af1db651
Branch: refs/heads/branch-alerts-dev
Commit: af1db65118e91792b44eee882fc8eea0fef887a9
Parents: 9385d47
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Aug 27 19:33:07 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Aug 27 19:33:07 2014 +0300
----------------------------------------------------------------------
.../stacks/HDP/1.3.2/hooks/before-START/scripts/params.py | 4 ++--
.../python/stacks/1.3.2/hooks/before-START/test_before_start.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/af1db651/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 4e58939..97f32d5 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
@@ -93,8 +93,8 @@ ambari_db_rca_driver = config['hostLevelParams']['ambari_db_rca_driver']
ambari_db_rca_username = config['hostLevelParams']['ambari_db_rca_username']
ambari_db_rca_password = config['hostLevelParams']['ambari_db_rca_password']
-if 'rca_enabled' in config['configurations']['hadoop-env']:
- rca_enabled = config['configurations']['hadoop-env']['rca_enabled']
+if 'rca_enabled' in config['configurations']['mapred-env']:
+ rca_enabled = config['configurations']['mapred-env']['rca_enabled']
else:
rca_enabled = False
rca_disabled_prefix = "###"
http://git-wip-us.apache.org/repos/asf/ambari/blob/af1db651/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 15d25a7..c559048 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
@@ -57,7 +57,7 @@ class TestHookBeforeStart(RMFTestCase):
owner = 'hdfs',
)
self.assertResourceCalled('File', '/etc/hadoop/conf/log4j.properties',
- content = 'log4jproperties\nline2log4jproperties\nline2',
+ content = 'log4jproperties\nline2log4jproperties\nline2\n\nlog4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender\nlog4j.appender.JHA.database=jdbc:postgresql://c6401.ambari.apache.org/ambarirca\nlog4j.appender.JHA.driver=org.postgresql.Driver\nlog4j.appender.JHA.user=mapred\nlog4j.appender.JHA.password=mapred\n\nlog4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=DEBUG,JHA\nlog4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true\n\n',
owner = 'hdfs',
group = 'hadoop',
mode = 0644,