You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/02/07 20:18:31 UTC
ambari git commit: AMBARI-19900. Ambari doesn't appear to configure
logging correctly for LLAP (Madhuvanthi Radhakrishnan via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 a45b52137 -> b09b2c8c2
AMBARI-19900. Ambari doesn't appear to configure logging correctly for LLAP (Madhuvanthi Radhakrishnan via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b09b2c8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b09b2c8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b09b2c8c
Branch: refs/heads/branch-2.5
Commit: b09b2c8c27bcdff578a78f1d7e7c9e2839ca16a2
Parents: a45b521
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Feb 7 12:17:40 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Feb 7 12:17:40 2017 -0800
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/hive_interactive.py | 2 +-
.../src/test/python/stacks/2.5/HIVE/test_hive_server_int.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b09b2c8c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
index 3558cf1..b4e4a03 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
@@ -228,7 +228,7 @@ def hive_interactive(name=None):
mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
- content=params.llap_daemon_log4j)
+ content=InlineTemplate(params.llap_daemon_log4j))
llap_cli_log4j2_filename = 'llap-cli-log4j2.properties'
File(format("{hive_server_interactive_conf_dir}/{llap_cli_log4j2_filename}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/b09b2c8c/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index fb97612..dde7933 100644
--- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
+++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
@@ -560,7 +560,7 @@ class TestHiveServerInteractive(RMFTestCase):
mode = 0600,
)
self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-daemon-log4j2.properties'),
- content='con\ntent',
+ content=InlineTemplate('con\ntent'),
owner='hive',
group='hadoop',
mode=0600,
@@ -625,7 +625,7 @@ class TestHiveServerInteractive(RMFTestCase):
mode = 0644,
)
self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-daemon-log4j2.properties'),
- content='con\ntent',
+ content=InlineTemplate('con\ntent'),
owner='hive',
group='hadoop',
mode=0644,