Procházet zdrojové kódy

AMBARI-4599. Temporary directory does not get created during HBase
client installation using Ambari (Arsen Babych via aonishuk)

Andrew Onischuk před 11 roky
rodič
revize
53ef1ce765

+ 7 - 2
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py

@@ -31,7 +31,12 @@ def hbase(type=None # 'master' or 'regionserver' or 'client'
       group = params.user_group,
       recursive = True
   )
-  
+
+  Directory ( params.tmp_dir,
+              owner = params.hbase_user,
+              recursive = True
+  )
+
   XmlConfig( "hbase-site.xml",
             conf_dir = params.conf_dir,
             configurations = params.config['configurations']['hbase-site'],
@@ -76,7 +81,7 @@ def hbase(type=None # 'master' or 'regionserver' or 'client'
       recursive = True
     )
   
-    Directory ( [params.tmp_dir, params.log_dir],
+    Directory (params.log_dir,
       owner = params.hbase_user,
       recursive = True
     )

+ 8 - 3
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py

@@ -31,7 +31,12 @@ def hbase(type=None # 'master' or 'regionserver' or 'client'
       group = params.user_group,
       recursive = True
   )
-  
+
+  Directory (params.tmp_dir,
+             owner = params.hbase_user,
+             recursive = True
+  )
+
   XmlConfig( "hbase-site.xml",
             conf_dir = params.conf_dir,
             configurations = params.config['configurations']['hbase-site'],
@@ -45,7 +50,7 @@ def hbase(type=None # 'master' or 'regionserver' or 'client'
             owner = params.hbase_user,
             group = params.user_group
   )
-  
+
   if 'hbase-policy' in params.config['configurations']:
     XmlConfig( "hbase-policy.xml",
       configurations = params.config['configurations']['hbase-policy'],
@@ -76,7 +81,7 @@ def hbase(type=None # 'master' or 'regionserver' or 'client'
       recursive = True
     )
   
-    Directory ( [params.tmp_dir, params.log_dir],
+    Directory (params.log_dir,
       owner = params.hbase_user,
       recursive = True
     )

+ 9 - 1
ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py

@@ -35,6 +35,10 @@ class TestHBaseClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/hbase',
+      owner = 'hbase',
+      recursive = True,
+    )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
       group = 'hadoop',
@@ -88,7 +92,11 @@ class TestHBaseClient(RMFTestCase):
       owner = 'hbase',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
+    self.assertResourceCalled('Directory', '/hadoop/hbase',
+      owner = 'hbase',
+      recursive = True,
+    )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
       group = 'hadoop',

+ 16 - 8
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py

@@ -29,12 +29,16 @@ class TestHBaseClient(RMFTestCase):
                    command = "configure",
                    config_file="secured.json"
     )
-    
+
     self.assertResourceCalled('Directory', '/etc/hbase/conf',
       owner = 'hbase',
       group = 'hadoop',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/hbase',
+      owner = 'hbase',
+      recursive = True,
+    )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
       group = 'hadoop',
@@ -83,36 +87,40 @@ class TestHBaseClient(RMFTestCase):
                    command = "configure",
                    config_file="default.json"
     )
-    
+
     self.assertResourceCalled('Directory', '/etc/hbase/conf',
       owner = 'hbase',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
+    self.assertResourceCalled('Directory', '/hadoop/hbase',
+      owner = 'hbase',
+      recursive = True,
+    )
     self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
       owner = 'hbase',
       group = 'hadoop',
       conf_dir = '/etc/hbase/conf',
       configurations = self.getConfig()['configurations']['hbase-site'], # don't hardcode all the properties
-    )    
+    )
     self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
       owner = 'hbase',
       group = 'hadoop',
       conf_dir = '/etc/hbase/conf',
       configurations = self.getConfig()['configurations']['hdfs-site'], # don't hardcode all the properties
-    )    
+    )
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml',
       owner = 'hbase',
       group = 'hadoop',
-    )    
+    )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hbase-env.sh',
       owner = 'hbase',
       template_tag = None,
-    )    
+    )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',
       template_tag = 'GANGLIA-RS',
-    )    
+    )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/regionservers',
       owner = 'hbase',
       template_tag = None,