You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/06/05 15:50:46 UTC

ambari git commit: AMBARI-11721. Handle if non-default value is used for hbase.tmp.dir (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk ea7485ae5 -> fb90a26e8


AMBARI-11721. Handle if non-default value is used for hbase.tmp.dir (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb90a26e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb90a26e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb90a26e

Branch: refs/heads/trunk
Commit: fb90a26e82a58c9b72d506786fbdb6decc759dff
Parents: ea7485a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Jun 5 16:50:32 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Jun 5 16:50:32 2015 +0300

----------------------------------------------------------------------
 .../0.96.0.2.0/configuration/hbase-site.xml     |  2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py   | 17 +-------
 .../0.96.0.2.0/package/scripts/params_linux.py  |  3 +-
 .../stacks/2.0.6/HBASE/test_hbase_client.py     | 26 +------------
 .../stacks/2.0.6/HBASE/test_hbase_master.py     | 39 ++-----------------
 .../2.0.6/HBASE/test_hbase_regionserver.py      | 41 ++------------------
 .../2.0.6/HBASE/test_phoenix_queryserver.py     | 26 +------------
 .../python/stacks/2.0.6/configs/default.json    |  2 +-
 .../python/stacks/2.0.6/configs/hbase-2.2.json  |  2 +-
 .../stacks/2.0.6/configs/hbase-check-2.2.json   |  4 +-
 .../stacks/2.0.6/configs/hbase-preupgrade.json  |  2 +-
 .../stacks/2.0.6/configs/hbase-rs-2.2.json      |  2 +-
 .../python/stacks/2.0.6/configs/secured.json    |  2 +-
 .../stacks/2.3/configs/hbase_default.json       |  2 +-
 .../python/stacks/2.3/configs/hbase_secure.json |  2 +-
 15 files changed, 25 insertions(+), 147 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/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 65f72a7..1cad600 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-{{hbase_user}}</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/fb90a26e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index 1bfa7e4..0478398 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -56,27 +56,14 @@ def hbase(name=None):
       recursive = True
   )
 
-  Directory (params.tmp_dir,
+  Directory (InlineTemplate(params.hbase_tmp_dir).get_content()+"/local/jars",
              owner = params.hbase_user,
+             group = params.user_group,
              mode=0775,
              recursive = True,
              cd_access="a",
   )
 
-  Directory (params.local_dir,
-             owner = params.hbase_user,
-             group = params.user_group,
-             mode=0775,
-             recursive = True
-  )
-
-  Directory (os.path.join(params.local_dir, "jars"),
-             owner = params.hbase_user,
-             group = params.user_group,
-             mode=0775,
-             recursive = True
-  )
-
   XmlConfig( "hbase-site.xml",
             conf_dir = params.hbase_conf_dir,
             configurations = params.config['configurations']['hbase-site'],

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/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 e8585cd..d25eac8 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
@@ -35,7 +35,6 @@ from resource_management.libraries.functions import is_empty
 from resource_management.libraries.functions import get_unique_id_and_date
 from resource_management.libraries.script.script import Script
 
-
 from resource_management.libraries.functions.substitute_vars import substitute_vars
 
 # server configurations
@@ -298,3 +297,5 @@ if security_enabled:
   else: # HDP Stack 2.2 and less / ranger plugin enabled
     hbase_coprocessor_master_classes = "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor"
     hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor"
+
+hbase_tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/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..dfde2e5 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
@@ -46,23 +46,12 @@ class TestHBaseClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode=0775,
-      recursive = True,
-      cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True,
-    )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
       recursive = True,
+      cd_access='a'
     )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
@@ -137,23 +126,12 @@ class TestHBaseClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode=0775,
-      recursive = True,
-      cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True,
-    )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
       recursive = True,
+      cd_access='a'
     )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/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..839c396 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
@@ -204,23 +204,12 @@ class TestHBaseMaster(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode = 0775,
-      recursive = True,
-      cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True,
-    )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
       recursive = True,
+      cd_access='a'
     )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
@@ -327,23 +316,12 @@ class TestHBaseMaster(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode = 0775,
-      recursive = True,
-      cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True
-    )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
       recursive = True,
+      cd_access='a'
     )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
@@ -460,22 +438,11 @@ class TestHBaseMaster(RMFTestCase):
       group = 'hadoop',
       recursive = True)
 
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode = 0775,
-      recursive = True,
-      cd_access='a')
-
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True)
-
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
+      cd_access='a',
       recursive = True)
 
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/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..93bbb24 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
@@ -131,23 +131,12 @@ class TestHbaseRegionServer(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode=0775,
-      recursive = True,
-      cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True,
-    )
     self.assertResourceCalled('Directory', self.TMP_PATH +'/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
       recursive = True,
+      cd_access='a'
     )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
@@ -218,23 +207,12 @@ class TestHbaseRegionServer(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode=0775,
-      recursive = True,
-      cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True,
-    )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
       recursive = True,
+      cd_access='a'
     )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
@@ -316,23 +294,12 @@ class TestHbaseRegionServer(RMFTestCase):
       group = 'hadoop',
       recursive = True)
 
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-      owner = 'hbase',
-      mode = 0775,
-      recursive = True,
-      cd_access='a')
-
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-      owner = 'hbase',
-      group = 'hadoop',
-      mode=0775,
-      recursive = True)
-
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
       owner = 'hbase',
       group = 'hadoop',
       mode=0775,
-      recursive = True)
+      recursive = True,
+      cd_access='a')
 
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/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 c6ab01d..503a41c 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
@@ -187,23 +187,12 @@ class TestPhoenixQueryServer(RMFTestCase):
                               group = 'hadoop',
                               recursive = True,
                               )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-                              owner = 'hbase',
-                              mode=0775,
-                              recursive = True,
-                              cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-                              owner = 'hbase',
-                              group = 'hadoop',
-                              mode=0775,
-                              recursive = True,
-                              )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
                               owner = 'hbase',
                               group = 'hadoop',
                               mode=0775,
                               recursive = True,
+                              cd_access='a'
                               )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
                               owner = 'hbase',
@@ -277,23 +266,12 @@ class TestPhoenixQueryServer(RMFTestCase):
                               group = 'hadoop',
                               recursive = True,
                               )
-    self.assertResourceCalled('Directory', self.TMP_PATH,
-                              owner = 'hbase',
-                              mode=0775,
-                              recursive = True,
-                              cd_access='a'
-    )
-    self.assertResourceCalled('Directory', self.TMP_PATH + '/local',
-                              owner = 'hbase',
-                              group = 'hadoop',
-                              mode=0775,
-                              recursive = True,
-                              )
     self.assertResourceCalled('Directory', self.TMP_PATH + '/local/jars',
                               owner = 'hbase',
                               group = 'hadoop',
                               mode=0775,
                               recursive = True,
+                              cd_access='a'
                               )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
                               owner = 'hbase',

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 2c09011..639c2f3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -298,7 +298,7 @@
             "hbase.zookeeper.property.clientPort": "2181", 
             "hbase.regionserver.global.memstore.upperLimit": "0.4", 
             "zookeeper.session.timeout": "30000", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hbase.local.dir": "${hbase.tmp.dir}/local", 
             "hbase.hregion.max.filesize": "10737418240", 
             "hfile.block.cache.size": "0.40", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
index e7a516f..dd1d69a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
@@ -285,7 +285,7 @@
             "hbase.regionserver.global.memstore.upperLimit": "0.4", 
             "zookeeper.session.timeout": "30000", 
             "hbase.client.scanner.caching": "100", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hfile.block.cache.size": "0.40", 
             "hbase.hregion.max.filesize": "10737418240", 
             "hbase.security.authentication": "simple", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
index 83120eb..55750c5 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
@@ -280,7 +280,7 @@
             "hbase.regionserver.global.memstore.upperLimit": "0.4", 
             "zookeeper.session.timeout": "30000", 
             "hbase.client.scanner.caching": "100", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hfile.block.cache.size": "0.40", 
             "hbase.hregion.max.filesize": "10737418240", 
             "hbase.security.authentication": "simple", 
@@ -743,4 +743,4 @@
             "c6402.ambari.apache.org"
         ]
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
index 0b09520..afce859 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
@@ -53,7 +53,7 @@
             "hbase.regionserver.global.memstore.upperLimit": "0.4", 
             "zookeeper.session.timeout": "30000", 
             "hbase.client.scanner.caching": "100", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hfile.block.cache.size": "0.40", 
             "hbase.hregion.max.filesize": "10737418240", 
             "hbase.security.authentication": "simple", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
index 349a1cf..f3523a8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
@@ -285,7 +285,7 @@
             "hbase.regionserver.global.memstore.upperLimit": "0.4", 
             "zookeeper.session.timeout": "30000", 
             "hbase.client.scanner.caching": "100", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hfile.block.cache.size": "0.40", 
             "hbase.hregion.max.filesize": "10737418240", 
             "hbase.security.authentication": "simple", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 1d40121..54d7ca8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -330,7 +330,7 @@
             "hbase.hregion.max.filesize": "10737418240", 
             "hbase.regionserver.global.memstore.upperLimit": "0.4", 
             "zookeeper.session.timeout": "30000", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hbase.local.dir": "${hbase.tmp.dir}/local", 
             "hfile.block.cache.size": "0.40", 
             "hbase.regionserver.kerberos.principal": "hbase/_HOST@EXAMPLE.COM", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
index f5a4487..0cda06e 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
@@ -253,7 +253,7 @@
             "hbase.bucketcache.ioengine": "", 
             "zookeeper.session.timeout": "90000", 
             "hbase.regionserver.global.memstore.size": "${hbase.regionserver.global.memstore.upperLimit}", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hfile.block.cache.size": "0.40", 
             "hbase.hregion.max.filesize": "1073741824", 
             "hbase.client.scanner.caching": "100", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
index 39f91c0..5240fe9 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
@@ -355,7 +355,7 @@
             "hbase.bucketcache.ioengine": "", 
             "zookeeper.session.timeout": "90000", 
             "hbase.regionserver.global.memstore.size": "${hbase.regionserver.global.memstore.upperLimit}", 
-            "hbase.tmp.dir": "/hadoop/hbase", 
+            "hbase.tmp.dir": "/tmp/hbase-hbase",
             "hfile.block.cache.size": "0.40", 
             "hbase.regionserver.kerberos.principal": "hbase/_HOST@EXAMPLE.COM", 
             "phoenix.queryserver.kerberos.principal": "hbase/_HOST@EXAMPLE.COM",