You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/08/31 16:41:06 UTC
ambari git commit: AMBARI-12914. SQLA: Fix sudo(rights and owner) for
oozie and hive in scope of jdbc.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5618e3312 -> f8efd01a3
AMBARI-12914. SQLA: Fix sudo(rights and owner) for oozie and hive in scope of jdbc.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8efd01a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8efd01a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8efd01a
Branch: refs/heads/branch-2.1
Commit: f8efd01a3623e44dd7116878ca1ae704039f2ae3
Parents: 5618e33
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Mon Aug 31 17:39:43 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Mon Aug 31 17:39:43 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 8 ++++----
.../package/scripts/hive_metastore.py | 8 ++++----
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 8 ++++----
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 11 ++++-------
.../stacks/2.1/HIVE/test_hive_metastore.py | 20 +++++++++++---------
5 files changed, 27 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8efd01a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index f10cca1..1b2b155 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -380,14 +380,14 @@ def jdbc_connector():
Execute(untar_sqla_type2_driver, sudo = True)
- Execute(as_sudo(['yes', '|', 'cp', params.jars_path_in_archive, params.hive_lib], auto_escape=False),
- path=["/bin", "/usr/bin/"])
+ Execute(format("yes | {sudo} cp {jars_path_in_archive} {hive_lib}"))
Directory(params.jdbc_libs_dir,
recursive=True)
- Execute(as_sudo(['yes', '|', 'cp', params.libs_path_in_archive, params.jdbc_libs_dir], auto_escape=False),
- path=["/bin", "/usr/bin/"])
+ Execute(format("yes | {sudo} cp {libs_path_in_archive} {jdbc_libs_dir}"))
+
+ Execute(format("{sudo} chown -R {hive_user}:{user_group} {hive_lib}/*"))
else:
Execute(('cp', '--remove-destination', params.downloaded_custom_connector, params.target),
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8efd01a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
index b955b12..796ec18 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
@@ -180,14 +180,14 @@ class HiveMetastoreDefault(HiveMetastore):
if params.sqla_db_used:
target_native_libs_directory = format("{target_directory}/native/lib64")
- Execute(as_sudo(['yes', '|', 'cp', params.jars_in_hive_lib, target_directory], auto_escape=False),
- path=["/bin", "/usr/bin/"])
+ Execute(format("yes | {sudo} cp {jars_in_hive_lib} {target_directory}"))
Directory(target_native_libs_directory,
recursive=True)
- Execute(as_sudo(['yes', '|', 'cp', params.libs_in_hive_lib, target_native_libs_directory], auto_escape=False),
- path=["/bin", "/usr/bin/"])
+ Execute(format("yes | {sudo} cp {libs_in_hive_lib} {target_native_libs_directory}"))
+
+ Execute(format("{sudo} chown -R {hive_user}:{user_group} {hive_lib}/*"))
else:
Execute(('cp', params.target, target_directory),
path=["/bin", "/usr/bin/"], sudo = True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8efd01a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 3e90eb5..2cee73e 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -319,14 +319,14 @@ def download_database_library_if_needed(target_directory = None):
Execute(untar_sqla_type2_driver, sudo = True)
- Execute(as_sudo(['yes', '|', 'cp', params.jars_path_in_archive, params.oozie_libext_dir], auto_escape=False),
- path=["/bin", "/usr/bin/"])
+ Execute(format("yes | {sudo} cp {jars_path_in_archive} {oozie_libext_dir}"))
Directory(params.jdbc_libs_dir,
recursive=True)
- Execute(as_sudo(['yes', '|', 'cp', params.libs_path_in_archive, params.jdbc_libs_dir], auto_escape=False),
- path=["/bin", "/usr/bin/"])
+ Execute(format("yes | {sudo} cp {libs_path_in_archive} {jdbc_libs_dir}"))
+
+ Execute(format("{sudo} chown -R {oozie_user}:{user_group} {oozie_libext_dir}/*"))
else:
Execute(('cp', '--remove-destination', params.downloaded_custom_connector, target_jar_with_directory),
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8efd01a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 525963d..24ee07a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -425,15 +425,12 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', ('tar', '-xvf', '/tmp/sqla-client-jdbc.tar.gz', '-C', '/tmp'),
sudo = True,
)
- self.assertResourceCalled('Execute', 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E yes | cp /tmp/sqla-client-jdbc/java/* /usr/lib/oozie/libext',
- path = ['/bin', '/usr/bin/'],
- )
+ self.assertResourceCalled('Execute', 'yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/java/* /usr/lib/oozie/libext')
self.assertResourceCalled('Directory', '/usr/lib/oozie/libext/native/lib64',
recursive = True,
)
- self.assertResourceCalled('Execute', 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E yes | cp /tmp/sqla-client-jdbc/native/lib64/* /usr/lib/oozie/libext/native/lib64',
- path = ['/bin', '/usr/bin/'],
- )
+ self.assertResourceCalled('Execute', 'yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/native/lib64/* /usr/lib/oozie/libext/native/lib64')
+ self.assertResourceCalled('Execute', 'ambari-sudo.sh chown -R oozie:hadoop /usr/lib/oozie/libext/*')
self.assertResourceCalled('File', '/usr/lib/oozie/libext/sajdbc4.jar',
owner = 'oozie',
group = 'hadoop',
@@ -1506,4 +1503,4 @@ class TestOozieServer(RMFTestCase):
self.assertEquals(
('conf-select', 'create-conf-dir', '--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
- mocks_dict['call'].call_args_list[0][0][0])
\ No newline at end of file
+ mocks_dict['call'].call_args_list[0][0][0])
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8efd01a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
index fe5a2b5..7075345 100644
--- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
@@ -638,32 +638,34 @@ class TestHiveMetastore(RMFTestCase):
sudo = True)
self.assertResourceCalled('Execute',
- ('ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E yes | cp /tmp/sqla-client-jdbc/java/* /usr/hdp/current/hive-server2/lib'),
- path = ['/bin', '/usr/bin/'])
+ ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/java/* /usr/hdp/current/hive-server2/lib'))
self.assertResourceCalled('Directory',
'/usr/hdp/current/hive-server2/lib/native/lib64',
recursive = True)
self.assertResourceCalled('Execute',
- ('ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E yes | cp /tmp/sqla-client-jdbc/native/lib64/* /usr/hdp/current/hive-server2/lib/native/lib64'),
- path = ['/bin', '/usr/bin/'])
+ ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/native/lib64/* /usr/hdp/current/hive-server2/lib/native/lib64'))
+
+ self.assertResourceCalled('Execute',
+ ('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-server2/lib/*'))
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/sajdbc4.jar',
mode = 0644,
)
self.assertResourceCalled('Execute',
- ('ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E yes | cp /usr/hdp/current/hive-server2/lib/*.jar /usr/hdp/2.3.0.0-1234/hive/lib'),
- path = ['/bin', '/usr/bin/'])
+ ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-server2/lib/*.jar /usr/hdp/2.3.0.0-1234/hive/lib'))
self.assertResourceCalled('Directory',
'/usr/hdp/2.3.0.0-1234/hive/lib/native/lib64',
recursive = True)
self.assertResourceCalled('Execute',
- ('ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E yes | cp /usr/hdp/current/hive-server2/lib/native/lib64/* /usr/hdp/2.3.0.0-1234/hive/lib/native/lib64'),
- path = ['/bin', '/usr/bin/'])
+ ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-server2/lib/native/lib64/* /usr/hdp/2.3.0.0-1234/hive/lib/native/lib64'))
+
+ self.assertResourceCalled('Execute',
+ ('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-server2/lib/*'))
self.assertResourceCalled('File', '/usr/hdp/2.3.0.0-1234/hive/lib/sajdbc4.jar',
mode = 0644,
@@ -675,4 +677,4 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-metastore', version), sudo=True,)
- self.assertNoMoreResources()
\ No newline at end of file
+ self.assertNoMoreResources()