Repository: ambari Updated Branches: refs/heads/trunk 49164681e -> 8fe5ee9a8
AMBARI-11361. Need to pass JAVA_HOME when the ranger-admin, ranger-usersync is started (Gautam Borad via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fe5ee9a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fe5ee9a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fe5ee9a Branch: refs/heads/trunk Commit: 8fe5ee9a83d16483dfc254c486033dd51c4a0460 Parents: 4916468 Author: Sumit Mohanty <[email protected]> Authored: Sun May 24 06:56:51 2015 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Sun May 24 06:56:51 2015 -0700 ---------------------------------------------------------------------- .../RANGER/0.4.0/package/scripts/ranger_admin.py | 2 +- .../0.4.0/package/scripts/ranger_service.py | 8 +++++--- .../0.4.0/package/scripts/ranger_usersync.py | 2 +- .../0.4.0/package/scripts/setup_ranger_xml.py | 2 +- .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 2 +- .../0.5.0.2.3/package/scripts/kms_service.py | 4 ++-- .../stacks/2.2/RANGER/test_ranger_admin.py | 6 +++++- .../stacks/2.2/RANGER/test_ranger_usersync.py | 19 ++++++++++++++----- 8 files changed, 30 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py index 40717f8..2c7a599 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py @@ -52,7 +52,7 @@ class RangerAdmin(Script): import params env.set_params(params) - Execute(format('{params.ranger_stop}'), user=params.unix_user) + Execute(format('{params.ranger_stop}'), environment={'JAVA_HOME': params.java_home}, user=params.unix_user) def pre_rolling_restart(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py index 8fda5f4..6e32dac 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py @@ -24,18 +24,20 @@ def ranger_service(name, action=None): if name == 'ranger_admin': no_op_test = format('ps -ef | grep proc_rangeradmin | grep -v grep') - Execute(params.ranger_start, user=params.unix_user, not_if=no_op_test) + Execute(params.ranger_start, environment={'JAVA_HOME': params.java_home}, user=params.unix_user, not_if=no_op_test) elif name == 'ranger_usersync': no_op_test = format('ps -ef | grep proc_rangerusersync | grep -v grep') if params.stack_is_hdp23_or_further: - Execute(params.usersync_start, + Execute(params.usersync_start, + environment={'JAVA_HOME': params.java_home}, not_if=no_op_test, user=params.unix_user, ) else: # Usersync requires to be run as root for 2.2 - Execute((params.usersync_start,), + Execute((params.usersync_start,), + environment={'JAVA_HOME': params.java_home}, not_if=no_op_test, sudo=True, ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py index 4ef9377..768bfa4 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py @@ -54,7 +54,7 @@ class RangerUsersync(Script): import params env.set_params(params) - Execute((params.usersync_stop,), sudo=True) + Execute((params.usersync_stop,), environment={'JAVA_HOME': params.java_home}, sudo=True) def status(self, env): cmd = 'ps -ef | grep proc_rangerusersync | grep -v grep' http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py index f89cdb5..d8dc390 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py @@ -20,7 +20,7 @@ limitations under the License. import os from resource_management.core.logger import Logger from resource_management.core.resources.system import File, Directory, Execute -from resource_management.core.source import DownloadSource +from resource_management.core.source import DownloadSource, InlineTemplate from resource_management.libraries.resources.xml_config import XmlConfig from resource_management.libraries.resources.modify_properties_file import ModifyPropertiesFile from resource_management.core.exceptions import Fail http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py index cdc2192..6fc8c99 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py @@ -89,7 +89,7 @@ def setup_java_patch(): if len(hadoop_jar_files) != 0: for f in hadoop_jar_files: - Execute(('jar','-uf', format('{kms_home}/ews/webapp/lib/{f}'), format('{kms_home}/ews/webapp/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory')), + Execute((format('{java_home}/bin/jar'),'-uf', format('{kms_home}/ews/webapp/lib/{f}'), format('{kms_home}/ews/webapp/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory')), sudo=True) File(format('{kms_home}/ews/webapp/lib/{f}'), owner=params.kms_user, group=params.kms_group) http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_service.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_service.py index cb98cb7..5c4d7e7 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_service.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_service.py @@ -29,10 +29,10 @@ def kms_service(action='start'): if action == 'start': no_op_test = format('ps -ef | grep proc_rangerkms | grep -v grep') cmd = format('{kms_home}/ranger-kms start') - Execute(cmd, not_if=no_op_test, user=format('{kms_user}')) + Execute(cmd, not_if=no_op_test, environment={'JAVA_HOME': format('{java_home}')}, user=format('{kms_user}')) elif action == 'stop': cmd = format('{kms_home}/ranger-kms stop') - Execute(cmd, user=format('{kms_user}')) + Execute(cmd, environment={'JAVA_HOME': format('{java_home}')}, user=format('{kms_user}')) elif action == 'status': cmd = 'ps -ef | grep proc_rangerkms | grep -v grep' code, output = shell.call(cmd, timeout=20) http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py index 57674cd..8448bf5 100644 --- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py @@ -46,6 +46,7 @@ class TestRangerAdmin(RMFTestCase): ) self.assert_configure_default() self.assertResourceCalled('Execute', '/usr/bin/ranger-admin-start', + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = 'ps -ef | grep proc_rangeradmin | grep -v grep', user = 'ranger', ) @@ -60,7 +61,8 @@ class TestRangerAdmin(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/bin/ranger-admin-stop', - user = 'ranger', + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + user = 'ranger' ) self.assertNoMoreResources() @@ -85,6 +87,7 @@ class TestRangerAdmin(RMFTestCase): ) self.assert_configure_secured() self.assertResourceCalled('Execute', '/usr/bin/ranger-admin-start', + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = 'ps -ef | grep proc_rangeradmin | grep -v grep', user = 'ranger', ) @@ -100,6 +103,7 @@ class TestRangerAdmin(RMFTestCase): ) self.assertResourceCalled('Execute', '/usr/bin/ranger-admin-stop', user = 'ranger', + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'} ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe5ee9a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py index 4cb5384..6464efc 100644 --- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py +++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py @@ -47,6 +47,7 @@ class TestRangerUsersync(RMFTestCase): ) self.assert_configure_default() self.assertResourceCalled('Execute', ('/usr/bin/ranger-usersync-start',), + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = 'ps -ef | grep proc_rangerusersync | grep -v grep', sudo = True, ) @@ -61,7 +62,8 @@ class TestRangerUsersync(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('/usr/bin/ranger-usersync-stop',), - sudo = True, + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + sudo = True ) self.assertNoMoreResources() @@ -86,8 +88,9 @@ class TestRangerUsersync(RMFTestCase): ) self.assert_configure_secured() self.assertResourceCalled('Execute', ('/usr/bin/ranger-usersync-start',), + environment= {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = 'ps -ef | grep proc_rangerusersync | grep -v grep', - sudo = True, + sudo = True ) self.assertNoMoreResources() @@ -100,7 +103,8 @@ class TestRangerUsersync(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('/usr/bin/ranger-usersync-stop',), - sudo = True, + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + sudo = True ) self.assertNoMoreResources() @@ -114,7 +118,10 @@ class TestRangerUsersync(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertTrue(setup_usersync_mock.called) - self.assertResourceCalled("Execute", ("/usr/bin/ranger-usersync-stop",), sudo=True) + self.assertResourceCalled("Execute", ("/usr/bin/ranger-usersync-stop",), + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_67'}, + sudo = True + ) self.assertResourceCalled("Execute", "hdp-select set ranger-usersync 2.2.2.0-2399") @patch("setup_ranger.setup_usersync") @@ -135,7 +142,9 @@ class TestRangerUsersync(RMFTestCase): mocks_dict = mocks_dict) self.assertTrue(setup_usersync_mock.called) - self.assertResourceCalled("Execute", ("/usr/bin/ranger-usersync-stop",), sudo=True) + self.assertResourceCalled("Execute", ("/usr/bin/ranger-usersync-stop",), + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_67'}, + sudo = True) self.assertResourceCalled("Execute", "hdp-select set ranger-usersync 2.3.0.0-1234") self.assertEquals(3, mocks_dict['call'].call_count)
