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 2015/05/24 16:22:04 UTC
ambari git commit: Revert "AMBARI-11312. Value of hbase.tmp.dir
should contain ${user.name} instead of hard coded directory path (Ted Yu via
smohanty)"
Repository: ambari
Updated Branches:
refs/heads/trunk 8fe5ee9a8 -> e6f975a64
Revert "AMBARI-11312. Value of hbase.tmp.dir should contain ${user.name} instead of hard coded directory path (Ted Yu via smohanty)"
This reverts commit 064f841ad8c3ed002b2a8f9ed69b8ce7bdea2fc5.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6f975a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6f975a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6f975a6
Branch: refs/heads/trunk
Commit: e6f975a644ae20a4374197c205d2eb5fae84ac27
Parents: 8fe5ee9
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sun May 24 07:20:09 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sun May 24 07:20:09 2015 -0700
----------------------------------------------------------------------
.../0.96.0.2.0/configuration/hbase-site.xml | 2 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 4 ++--
.../HDP/2.0.6/hooks/before-ANY/scripts/params.py | 2 +-
.../2.0.6/hooks/before-INSTALL/scripts/params.py | 2 +-
.../2.0.6/hooks/before-START/scripts/params.py | 2 +-
.../stacks/2.0.6/HBASE/test_hbase_client.py | 13 ++++++-------
.../stacks/2.0.6/HBASE/test_hbase_master.py | 19 +++++++++----------
.../2.0.6/HBASE/test_hbase_regionserver.py | 19 +++++++++----------
.../2.0.6/HBASE/test_phoenix_queryserver.py | 15 +++++++--------
.../2.0.6/hooks/before-ANY/test_before_any.py | 6 ++----
10 files changed, 39 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index 5848b68..a31cc2c 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -49,7 +49,7 @@
</property>
<property>
<name>hbase.tmp.dir</name>
- <value>/tmp/hbase-${user.name}</value>
+ <value>/tmp/hbase</value>
<description>Temporary directory on the local filesystem.
Change this setting to point to a location more permanent
than '/tmp' (The '/tmp' directory is often cleared on
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 441e68e..e37bd82 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -104,9 +104,9 @@ regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, regionserver_xm
pid_dir = status_params.pid_dir
-tmp_dir = "/tmp/hbase-hbase"
+tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
# TODO UPGRADE default, update site during upgrade
-_local_dir_conf = "/tmp/hbase-hbase/local"
+_local_dir_conf = default('/configurations/hbase-site/hbase.local.dir', "${hbase.tmp.dir}/local")
local_dir = substitute_vars(_local_dir_conf, config['configurations']['hbase-site'])
client_jaas_config_file = format("{hbase_conf_dir}/hbase_client_jaas.conf")
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 837bd66..e0934ec 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -156,7 +156,7 @@ has_tez = 'tez-site' in config['configurations']
has_hbase_masters = not len(hbase_master_hosts) == 0
has_oozie_server = not len(oozie_servers) == 0
-hbase_tmp_dir = "/tmp/hbase-hbase"
+hbase_tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
proxyuser_group = default("/configurations/hadoop-env/proxyuser_group","users")
dfs_cluster_administrators_group = config['configurations']['hdfs-site']["dfs.cluster.administrators"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
index 35267db..b205f39 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
@@ -86,7 +86,7 @@ is_slave = hostname in slave_hosts
if has_ganglia_server:
ganglia_server_host = ganglia_server_hosts[0]
-hbase_tmp_dir = "/tmp/hbase-hbase"
+hbase_tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
#security params
security_enabled = config['configurations']['cluster-env']['security_enabled']
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/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 0fee25b..c6d632d 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
@@ -108,7 +108,7 @@ hadoop_pid_dir_prefix = config['configurations']['hadoop-env']['hadoop_pid_dir_p
task_log4j_properties_location = os.path.join(hadoop_conf_dir, "task-log4j.properties")
hdfs_log_dir_prefix = config['configurations']['hadoop-env']['hdfs_log_dir_prefix']
-hbase_tmp_dir = "/tmp/hbase-hbase"
+hbase_tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
#db params
server_db_name = config['hostLevelParams']['db_name']
db_driver_filename = config['hostLevelParams']['db_driver_filename']
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index afe3de6..5b57393 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -27,7 +27,6 @@ from stacks.utils.RMFTestCase import *
class TestHBaseClient(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"
STACK_VERSION = "2.0.6"
- TMP_PATH = '/tmp/hbase-hbase'
def test_configure_secured(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hbase_client.py",
@@ -46,19 +45,19 @@ class TestHBaseClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode=0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -137,19 +136,19 @@ class TestHBaseClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode=0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index da0d624..0c87a80 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -26,7 +26,6 @@ from stacks.utils.RMFTestCase import *
class TestHBaseMaster(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"
STACK_VERSION = "2.0.6"
- TMP_PATH = "/tmp/hbase-hbase"
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hbase_master.py",
@@ -204,19 +203,19 @@ class TestHBaseMaster(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode = 0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -327,19 +326,19 @@ class TestHBaseMaster(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode = 0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -460,19 +459,19 @@ class TestHBaseMaster(RMFTestCase):
group = 'hadoop',
recursive = True)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode = 0775,
recursive = True,
cd_access='a')
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
index 47e8ef3..3175a01 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
@@ -26,7 +26,6 @@ from stacks.utils.RMFTestCase import *
class TestHbaseRegionServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"
STACK_VERSION = "2.0.6"
- TMP_PATH = '/tmp/hbase-hbase'
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hbase_regionserver.py",
@@ -131,19 +130,19 @@ class TestHbaseRegionServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode=0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH +'/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -218,19 +217,19 @@ class TestHbaseRegionServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode=0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -316,19 +315,19 @@ class TestHbaseRegionServer(RMFTestCase):
group = 'hadoop',
recursive = True)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode = 0775,
recursive = True,
cd_access='a')
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
index 65bf884..5f1d856 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
@@ -26,7 +26,6 @@ from unittest import skip
class TestPhoenixQueryServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"
STACK_VERSION = "2.3"
- TMP_PATH = "/tmp/hbase-hbase"
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/phoenix_queryserver.py",
@@ -187,19 +186,19 @@ class TestPhoenixQueryServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode=0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -277,19 +276,19 @@ class TestPhoenixQueryServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode=0775,
recursive = True,
cd_access='a'
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local',
owner = 'hbase',
group = 'hadoop',
mode=0775,
recursive = True,
)
- self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
+ self.assertResourceCalled('Directory', '/hadoop/hbase/local/jars',
owner = 'hbase',
group = 'hadoop',
mode=0775,
@@ -360,4 +359,4 @@ class TestPhoenixQueryServer(RMFTestCase):
group='hadoop',
owner='hbase',
content='log4jproperties\nline2'
- )
+ )
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6f975a6/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index fb4a937..5c8154e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -24,8 +24,6 @@ from resource_management import Hook
@patch.object(Hook, "run_custom_hook", new = MagicMock())
class TestHookBeforeInstall(RMFTestCase):
- TMP_PATH = '/tmp/hbase-hbase'
-
@patch("os.path.exists")
def test_hook_default(self, os_path_exists_mock):
@@ -138,7 +136,7 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa',
not_if = '(test $(id -u ambari-qa) -gt 1000) || (false)',
)
- self.assertResourceCalled('Directory', self.TMP_PATH,
+ self.assertResourceCalled('Directory', '/hadoop/hbase',
owner = 'hbase',
mode = 0775,
recursive = True,
@@ -148,7 +146,7 @@ class TestHookBeforeInstall(RMFTestCase):
content = StaticFile('changeToSecureUid.sh'),
mode = 0555,
)
- self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,' + self.TMP_PATH,
+ self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase',
not_if = '(test $(id -u hbase) -gt 1000) || (false)',
)
self.assertResourceCalled('User', 'test_user1',