ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/2] git commit: AMBARI-4599. Temporary directory does not get created during HBase client installation using Ambari (Arsen Babych via aonishuk)
Date Tue, 11 Feb 2014 13:59:10 GMT
AMBARI-4599. Temporary directory does not get created during HBase
client installation using Ambari (Arsen Babych via aonishuk)


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

Branch: refs/heads/trunk
Commit: 53ef1ce765e3536899439995855fdd341df6036f
Parents: 6cbdded
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Tue Feb 11 05:34:39 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Tue Feb 11 05:58:55 2014 -0800

----------------------------------------------------------------------
 .../services/HBASE/package/scripts/hbase.py     |  9 ++++++--
 .../services/HBASE/package/scripts/hbase.py     | 11 ++++++---
 .../stacks/1.3.2/HBASE/test_hbase_client.py     | 10 +++++++-
 .../stacks/2.0.6/HBASE/test_hbase_client.py     | 24 +++++++++++++-------
 4 files changed, 40 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/53ef1ce7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
index fddd1b7..e77a233 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py
+++ b/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
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/53ef1ce7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
index 95f3e30..c0f48dc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py
+++ b/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
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/53ef1ce7/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
index f226616..5ef19c3 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
+++ b/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',

http://git-wip-us.apache.org/repos/asf/ambari/blob/53ef1ce7/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 b0d4d31..bd3228f 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
@@ -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,


Mime
View raw message