AMBARI-11303 Flume Start fails (dsen)

ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py

@@ -85,7 +85,10 @@ def flume(action = None):
     for n in find_expected_agent_names(params.flume_conf_dir):
       os.unlink(os.path.join(params.flume_conf_dir, n, 'ambari-meta.json'))
 
-    Directory(params.flume_conf_dir, recursive=True)
+    Directory(params.flume_conf_dir,
+              recursive=True,
+              owner=params.flume_user,
+              )
     Directory(params.flume_log_dir, owner=params.flume_user)
 
     flume_agents = {}
@@ -99,18 +102,23 @@ def flume(action = None):
       flume_agent_log4j_file = os.path.join(flume_agent_conf_dir, 'log4j.properties')
       flume_agent_env_file = os.path.join(flume_agent_conf_dir, 'flume-env.sh')
 
-      Directory(flume_agent_conf_dir)
+      Directory(flume_agent_conf_dir,
+                owner=params.flume_user,
+                )
 
       PropertiesFile(flume_agent_conf_file,
         properties=flume_agents[agent],
+        owner=params.flume_user,
         mode = 0644)
 
       File(flume_agent_log4j_file,
         content=Template('log4j.properties.j2', agent_name = agent),
+        owner=params.flume_user,
         mode = 0644)
 
       File(flume_agent_meta_file,
         content = json.dumps(ambari_meta(agent, flume_agents[agent])),
+        owner=params.flume_user,
         mode = 0644)
 
       File(flume_agent_env_file,

ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py

@@ -183,24 +183,35 @@ class TestFlumeHandler(RMFTestCase):
 
   def assert_configure_default(self):
 
-    self.assertResourceCalled('Directory', '/etc/flume/conf', recursive=True)
-
-    self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume')
-
-    self.assertResourceCalled('Directory', '/etc/flume/conf/a1')
-
-    self.assertResourceCalled('PropertiesFile', '/etc/flume/conf/a1/flume.conf',
-      mode = 0644,
-      properties = build_flume(
-        self.getConfig()['configurations']['flume-conf']['content'])['a1'])
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf',
+                              owner='flume',
+                              recursive=True)
+
+    self.assertResourceCalled('Directory',
+                              '/var/log/flume',
+                              owner = 'flume')
+
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf/a1',
+                              owner='flume')
+
+    self.assertResourceCalled('PropertiesFile',
+                              '/etc/flume/conf/a1/flume.conf',
+                              owner='flume',
+                              mode = 0644,
+                              properties = build_flume(
+                                self.getConfig()['configurations']['flume-conf']['content'])['a1'])
 
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/log4j.properties',
       content = Template('log4j.properties.j2', agent_name = 'a1'),
+      owner='flume',
       mode = 0644)
 
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/ambari-meta.json',
+      owner='flume',
       content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}',
       mode = 0644)
 
@@ -211,23 +222,32 @@ class TestFlumeHandler(RMFTestCase):
 
   def assert_configure_many(self):
 
-    self.assertResourceCalled('Directory', '/etc/flume/conf', recursive=True)
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf',
+                              owner='flume',
+                              recursive=True)
 
     self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume')
 
     top = build_flume(self.getConfig()['configurations']['flume-conf']['content'])
 
     # a1
-    self.assertResourceCalled('Directory', '/etc/flume/conf/a1')
-    self.assertResourceCalled('PropertiesFile', '/etc/flume/conf/a1/flume.conf',
-      mode = 0644,
-      properties = top['a1'])
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf/a1',
+                              owner='flume')
+    self.assertResourceCalled('PropertiesFile',
+                              '/etc/flume/conf/a1/flume.conf',
+                              owner='flume',
+                              mode = 0644,
+                              properties = top['a1'])
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/log4j.properties',
+      owner='flume',
       content = Template('log4j.properties.j2', agent_name = 'a1'),
       mode = 0644)
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/ambari-meta.json',
+      owner='flume',
       content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}',
       mode = 0644)
 
@@ -237,16 +257,21 @@ class TestFlumeHandler(RMFTestCase):
     )
 
     # b1
-    self.assertResourceCalled('Directory', '/etc/flume/conf/b1')
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf/b1',
+                              owner='flume')
     self.assertResourceCalled('PropertiesFile', '/etc/flume/conf/b1/flume.conf',
       mode = 0644,
+      owner='flume',
       properties = top['b1'])
     self.assertResourceCalled('File',
       '/etc/flume/conf/b1/log4j.properties',
+      owner='flume',
       content = Template('log4j.properties.j2', agent_name = 'b1'),
       mode = 0644)
     self.assertResourceCalled('File',
       '/etc/flume/conf/b1/ambari-meta.json',
+      owner='flume',
       content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}',
       mode = 0644)
     self.assertResourceCalled('File', "/etc/flume/conf/b1/flume-env.sh",
@@ -363,24 +388,35 @@ class TestFlumeHandler(RMFTestCase):
                        hdp_stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES)
 
-    self.assertResourceCalled('Directory', '/etc/flume/conf', recursive=True)
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf',
+                              owner='flume',
+                              recursive=True)
 
-    self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume')
+    self.assertResourceCalled('Directory',
+                              '/var/log/flume',
+                              owner = 'flume')
 
-    self.assertResourceCalled('Directory', '/etc/flume/conf/a1')
+    self.assertResourceCalled('Directory',
+                              '/etc/flume/conf/a1',
+                              owner='flume')
 
-    self.assertResourceCalled('PropertiesFile', '/etc/flume/conf/a1/flume.conf',
-      mode = 0644,
-      properties = build_flume(
-        self.getConfig()['configurations']['flume-conf']['content'])['a1'])
+    self.assertResourceCalled('PropertiesFile',
+                              '/etc/flume/conf/a1/flume.conf',
+                              owner='flume',
+                              mode = 0644,
+                              properties = build_flume(
+                                self.getConfig()['configurations']['flume-conf']['content'])['a1'])
 
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/log4j.properties',
+      owner='flume',
       content = Template('log4j.properties.j2', agent_name = 'a1'),
       mode = 0644)
 
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/ambari-meta.json',
+      owner='flume',
       content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}',
       mode = 0644)
 
@@ -400,32 +436,44 @@ class TestFlumeHandler(RMFTestCase):
                        hdp_stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES)
 
-    self.assertResourceCalled('Directory', '/usr/hdp/current/flume-server/conf', recursive=True)
+    self.assertResourceCalled('Directory',
+                              '/usr/hdp/current/flume-server/conf',
+                              owner='flume',
+                              recursive=True)
 
-    self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume')
+    self.assertResourceCalled('Directory',
+                              '/var/log/flume',
+                              owner = 'flume')
 
-    self.assertResourceCalled('Directory', '/usr/hdp/current/flume-server/conf/a1')
+    self.assertResourceCalled('Directory',
+                              '/usr/hdp/current/flume-server/conf/a1',
+                              owner='flume')
 
-    self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/flume-server/conf/a1/flume.conf',
-      mode = 0644,
-      properties = build_flume(
-        self.getConfig()['configurations']['flume-conf']['content'])['a1'])
+    self.assertResourceCalled('PropertiesFile',
+                              '/usr/hdp/current/flume-server/conf/a1/flume.conf',
+                              owner='flume',
+                              mode = 0644,
+                              properties = build_flume(
+                                self.getConfig()['configurations']['flume-conf']['content'])['a1'])
 
     self.assertResourceCalled('File',
       '/usr/hdp/current/flume-server/conf/a1/log4j.properties',
       content = Template('log4j.properties.j2', agent_name = 'a1'),
+      owner='flume',
       mode = 0644)
 
     self.assertResourceCalled('File',
       '/usr/hdp/current/flume-server/conf/a1/ambari-meta.json',
       content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}',
+      owner='flume',
       mode = 0644)
 
     content = InlineTemplate(self.getConfig()['configurations']['flume-env']['content'])
 
     self.assertTrue(content.get_content().find('/usr/hdp/current/hive-metastore') > -1)
 
-    self.assertResourceCalled('File', "/usr/hdp/current/flume-server/conf/a1/flume-env.sh",
+    self.assertResourceCalled('File',
+                              "/usr/hdp/current/flume-server/conf/a1/flume-env.sh",
                               owner="flume",
                               content=content)