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

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

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'],

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']

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',

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',

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',

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',

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", 

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", 

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"
         ]
     }
-}
+}

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", 

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", 

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", 

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", 

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",