AMBARI-7062. Client Config Download: log4j properties filenames should be the same as on an installed cluster host. (dlysnichenko)

ambari-common/src/main/python/resource_management/libraries/script/script.py

@@ -258,10 +258,13 @@ class Script(object):
                   configuration_attributes=params.config['configuration_attributes'][dict],
         )
     for file_dict in env_configs_list:
-      for filename,dict in file_dict.iteritems():
+      for filename,dicts in file_dict.iteritems():
+        content = ''
+        for dict in dicts.split(','):
+          if dict.strip() in params.config['configurations']:
+            content += params.config['configurations'][dict.strip()]['content']
         File(os.path.join(conf_tmp_dir, filename),
-             content=InlineTemplate(params.config['configurations'][dict]['content'])
-        )
+             content=InlineTemplate(content))
     with closing(tarfile.open(output_filename, "w:gz")) as tar:
       tar.add(conf_tmp_dir, arcname=os.path.basename("."))
       tar.close()

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml

@@ -108,7 +108,7 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>hbase-log4j.properties</fileName>
+              <fileName>log4j.properties</fileName>
               <dictionaryName>hbase-log4j</dictionaryName>
             </configFile>            
           </configFiles>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml

@@ -99,8 +99,8 @@
             </configFile>      
             <configFile>
               <type>env</type>
-              <fileName>hdfs-log4j.properties</fileName>
-              <dictionaryName>hdfs-log4j</dictionaryName>
+              <fileName>log4j.properties</fileName>
+              <dictionaryName>hdfs-log4j,mapreduce-log4j</dictionaryName>
             </configFile>            
           </configFiles>
         </component>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml

@@ -82,13 +82,8 @@
             </configFile>                       
             <configFile>
               <type>env</type>
-              <fileName>mapred-env.sh</fileName>
-              <dictionaryName>mapred-env</dictionaryName>
-            </configFile>
-            <configFile>
-              <type>env</type>
-              <fileName>mapreduce-log4j.properties</fileName>
-              <dictionaryName>mapreduce-log4j</dictionaryName>
+              <fileName>log4j.properties</fileName>
+              <dictionaryName>hdfs-log4j,mapreduce-log4j</dictionaryName>
             </configFile>            
           </configFiles>
         </component>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml

@@ -42,7 +42,7 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>pig-log4j.properties</fileName>
+              <fileName>log4j.properties</fileName>
               <dictionaryName>pig-log4j</dictionaryName>
             </configFile>
             <configFile>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml

@@ -54,7 +54,7 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>zookeeper-log4j.properties</fileName>
+              <fileName>log4j.properties</fileName>
               <dictionaryName>zookeeper-log4j</dictionaryName>
             </configFile>            
           </configFiles>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml

@@ -98,7 +98,7 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>hbase-log4j.properties</fileName>
+              <fileName>log4j.properties</fileName>
               <dictionaryName>hbase-log4j</dictionaryName>
             </configFile>            
           </configFiles>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml

@@ -103,8 +103,8 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>hdfs-log4j.properties</fileName>
-              <dictionaryName>hdfs-log4j</dictionaryName>
+              <fileName>log4j.properties</fileName>
+              <dictionaryName>hdfs-log4j,yarn-log4j</dictionaryName>
             </configFile>                          
             <configFile>
               <type>env</type>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml

@@ -42,7 +42,7 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>pig-log4j.properties</fileName>
+              <fileName>log4j.properties</fileName>
               <dictionaryName>pig-log4j</dictionaryName>
             </configFile>
             <configFile>
@@ -70,14 +70,6 @@
         <timeout>300</timeout>
       </commandScript>
 
-      <configFiles>
-        <configFile>
-          <type>env</type>
-          <fileName>pig-env.sh</fileName>
-          <dictionaryName>pig-env</dictionaryName>
-        </configFile>
-      </configFiles>
-      
       <requiredServices>
         <service>YARN</service>
       </requiredServices>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml

@@ -99,8 +99,8 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>yarn-log4j.properties</fileName>
-              <dictionaryName>yarn-log4j</dictionaryName>
+              <fileName>log4j.properties</fileName>
+              <dictionaryName>hdfs-log4j,yarn-log4j</dictionaryName>
             </configFile>
             <configFile>
               <type>xml</type>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml

@@ -53,7 +53,7 @@
             </configFile>
             <configFile>
               <type>env</type>
-              <fileName>zookeeper-log4j.properties</fileName>
+              <fileName>log4j.properties</fileName>
               <dictionaryName>zookeeper-log4j</dictionaryName>
             </configFile>            
           </configFiles>

ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml

@@ -40,6 +40,16 @@
               <fileName>falcon-env.sh</fileName>
               <dictionaryName>falcon-env</dictionaryName>
             </configFile>
+            <configFile>
+              <type>xml</type>
+              <fileName>runtime.properties</fileName>
+              <dictionaryName>falcon-runtime.properties</dictionaryName>
+            </configFile>
+            <configFile>
+              <type>xml</type>
+              <fileName>startup.properties</fileName>
+              <dictionaryName>falcon-startup.properties</dictionaryName>
+            </configFile>
           </configFiles>
         </component>
         <component>

ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py

@@ -48,6 +48,10 @@ class Test(RMFTestCase):
     self.assertResourceCalled('File', '/tmp/123/hadoop-env.sh',
                               content = InlineTemplate(self.getConfig()['configurations']['hadoop-env']['content']),
                               )
+    self.assertResourceCalled('File', '/tmp/123/log4j.properties',
+                              content = InlineTemplate(self.getConfig()['configurations']['hdfs-log4j']['content']+
+                                                       self.getConfig()['configurations']['yarn-log4j']['content']),
+                              )
     self.assertResourceCalled('Directory', '/tmp/123',
                               action = ['delete'],
                               )

ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -28,7 +28,7 @@
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "false",
         "xml_configs_list":[{"hdfs-site.xml":"hdfs-site"}],
-        "env_configs_list":[{"hadoop-env.sh":"hadoop-env"}],
+        "env_configs_list":[{"hadoop-env.sh":"hadoop-env"},{"log4j.properties":"hdfs-log4j,yarn-log4j"}],
         "output_file":"HDFS_CLIENT-configs.tar.gz"
 
     },