AMBARI-10730. Summary:Issues when log/pid dirs are customized - Falcon (Emil Anca via rlevas)

ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py

@@ -27,20 +27,24 @@ def falcon(type, action = None):
   import params
   if action == 'config':
     Directory(params.falcon_pid_dir,
-              owner=params.falcon_user
+              owner=params.falcon_user,
+              recursive=True
     )
     Directory(params.falcon_log_dir,
               owner=params.falcon_user,
               recursive=True
     )
     Directory(params.falcon_webapp_dir,
-              owner=params.falcon_user
+              owner=params.falcon_user,
+              recursive=True
     )
     Directory(params.falcon_home,
-              owner=params.falcon_user
+              owner=params.falcon_user,
+              recursive=True
     )
     Directory(params.falcon_conf_dir_prefix,
-              mode=0755
+              mode=0755,
+              recursive=True
     )
     Directory(params.falcon_conf_dir,
               owner=params.falcon_user,
@@ -72,7 +76,7 @@ def falcon(type, action = None):
                 group=params.user_group,
                 mode=0775,
                 recursive=True,
-                cd_access="a",
+                cd_access="a"
       )
 
     if params.falcon_graph_serialize_path:
@@ -81,7 +85,7 @@ def falcon(type, action = None):
                 group=params.user_group,
                 mode=0775,
                 recursive=True,
-                cd_access="a",
+                cd_access="a"
       )
 
   if type == 'server':
@@ -92,20 +96,37 @@ def falcon(type, action = None):
                              owner=params.falcon_user,
                              mode=0755
         )
+      if params.store_uri[0:4] == "file":
+        Directory(params.store_uri[7:],
+                  owner=params.falcon_user,
+                  recursive=True
+        )
       params.HdfsDirectory(params.flacon_apps_dir,
                            action="create_delayed",
                            owner=params.falcon_user,
                            mode=0777#TODO change to proper mode
       )
+      if params.falcon_store_uri[0:4] == "hdfs":
+        params.HdfsDirectory(params.falcon_store_uri,
+                             action="create_delayed",
+                             owner=params.falcon_user,
+                             mode=0755
+        )
+      if params.falcon_store_uri[0:4] == "file":
+        Directory(params.falcon_store_uri[7:],
+                  owner=params.falcon_user,
+                  recursive=True
+        )
       params.HdfsDirectory(None, action="create")
       Directory(params.falcon_local_dir,
                 owner=params.falcon_user,
                 recursive=True,
-                cd_access="a",
+                cd_access="a"
       )
       if params.falcon_embeddedmq_enabled == True:
         Directory(os.path.abspath(os.path.join(params.falcon_embeddedmq_data, "..")),
-                  owner=params.falcon_user
+                  owner=params.falcon_user,
+                  recursive=True
         )
         Directory(params.falcon_embeddedmq_data,
                   owner=params.falcon_user,

ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py

@@ -65,6 +65,7 @@ proxyuser_group =  config['configurations']['hadoop-env']['proxyuser_group']
 
 java_home = config['hostLevelParams']['java_home']
 falcon_local_dir = config['configurations']['falcon-env']['falcon_local_dir']
+falcon_store_uri = config['configurations']['falcon-env']['falcon_store_uri']
 falcon_log_dir = config['configurations']['falcon-env']['falcon_log_dir']
 
 # falcon-startup.properties

ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py

@@ -37,6 +37,7 @@ class TestFalconClient(RMFTestCase):
     )
     self.assertResourceCalled('Directory', '/var/run/falcon',
                               owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/var/log/falcon',
                               owner = 'falcon',
@@ -44,12 +45,15 @@ class TestFalconClient(RMFTestCase):
                               )
     self.assertResourceCalled('Directory', '/var/lib/falcon/webapp',
                               owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/usr/lib/falcon',
                               owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/etc/falcon',
-                              mode = 0755
+                              mode = 0755,
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/etc/falcon/conf',
                               owner = 'falcon',
@@ -89,7 +93,7 @@ class TestFalconClient(RMFTestCase):
 
     put_structured_out_mock.assert_called_with({"securityState": "SECURED_KERBEROS"})
 
-     # Testing with security_enable = false
+    # Testing with security_enable = false
     self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/falcon_client.py",
                        classname="FalconClient",
                        command="security_status",

ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py

@@ -77,6 +77,7 @@ class TestFalconServer(RMFTestCase):
   def assert_configure_default(self):
     self.assertResourceCalled('Directory', '/var/run/falcon',
                               owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/var/log/falcon',
                               owner = 'falcon',
@@ -84,12 +85,15 @@ class TestFalconServer(RMFTestCase):
                               )
     self.assertResourceCalled('Directory', '/var/lib/falcon/webapp',
                               owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/usr/lib/falcon',
                               owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/etc/falcon',
-                              mode = 0755
+                              mode = 0755,
+                              recursive = True
     )
     self.assertResourceCalled('Directory', '/etc/falcon/conf',
                               owner = 'falcon',
@@ -114,6 +118,10 @@ class TestFalconServer(RMFTestCase):
                               properties = self.getConfig()['configurations']['falcon-startup.properties'],
                               owner = 'falcon'
                               )
+    self.assertResourceCalled('Directory', '/hadoop/falcon/store',
+                              owner = 'falcon',
+                              recursive = True
+                              )
     self.assertResourceCalled('HdfsDirectory', '/apps/falcon',
                               security_enabled = False,
                               keytab = UnknownConfigurationMock(),
@@ -123,7 +131,11 @@ class TestFalconServer(RMFTestCase):
                               mode = 0777,
                               owner = 'falcon',
                               bin_dir = '/usr/bin',
-                              action = ['create_delayed'],
+                              action = ['create_delayed']
+                              )
+    self.assertResourceCalled('Directory', '/hadoop/falcon/store',
+                              owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('HdfsDirectory', None,
                               security_enabled = False,
@@ -140,11 +152,12 @@ class TestFalconServer(RMFTestCase):
                               cd_access='a'
                               )
     self.assertResourceCalled('Directory', '/hadoop/falcon/embeddedmq',
-                              owner = 'falcon'
+                              owner = 'falcon',
+                              recursive = True
                               )
     self.assertResourceCalled('Directory', '/hadoop/falcon/embeddedmq/data',
                               owner = 'falcon',
-                              recursive = True,
+                              recursive = True
                               )