Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 abcf1ce86 -> 6ddd4ac76


AMBARI-21649 : Update Atlas log4j to reflect latest configurations (Vishal 
Suvagia via mugdha)


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

Branch: refs/heads/branch-2.6
Commit: 6ddd4ac76f426e31386822b37b20ec3fa7b133e5
Parents: abcf1ce
Author: Vishal Suvagia <vishalsuva...@yahoo.com>
Authored: Wed Aug 9 14:02:05 2017 +0530
Committer: Mugdha Varadkar <mug...@apache.org>
Committed: Fri Aug 11 10:31:08 2017 +0530

----------------------------------------------------------------------
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 10 ++++++++--
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml    |  4 ++++
 .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |  1 +
 .../HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml  |  4 ++--
 .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  |  5 +++++
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml    |  4 ++++
 .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |  1 +
 7 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index f227bac..8664584 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -104,8 +104,8 @@
             <type>atlas-log4j</type>
             <set key="atlas_log_max_backup_size" value="256"/>
             <set key="atlas_log_number_of_backup_files" value="20"/>
-            <replace key="content" find="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" 
replace-with="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;\n&lt;param 
name=&quot;MaxFileSize&quot; value=&quot;{{atlas_log_max_backup_size}}MB&quot; 
/&gt;"/>
-            <replace key="content" find="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" 
replace-with="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;\n&lt;param 
name=&quot;MaxFileSize&quot; 
value=&quot;{{atlas_log_number_of_backup_files}}&quot; /&gt;"/>
+            <replace key="content" find="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" 
replace-with="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;&#xA;&#x20;&#x20;&#x20;&#x20;&lt;param
 name=&quot;MaxFileSize&quot; value=&quot;{{atlas_log_max_backup_size}}MB&quot; 
/&gt;"/>
+            <replace key="content" find="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" 
replace-with="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;&#xA;&#x20;&#x20;&#x20;&#x20;&lt;param
 name=&quot;MaxBackupIndex&quot; 
value=&quot;{{atlas_log_number_of_backup_files}}&quot; /&gt;"/>
           </definition>
 
           <definition xsi:type="configure" 
id="hdp_2_5_4_0_atlas_exclude_tls_protocol" summary="Excluding TLS v1.2 
Protocol">
@@ -127,6 +127,12 @@
             <type>application-properties</type>
             <transfer operation="delete" 
delete-key="atlas.kafka.auto.commit.enable"/>
           </definition>
+
+          <definition xsi:type="configure" 
id="atlas_log4j_update_logger_settings" summary="Updating logger configurations 
for Atlas.">
+            <type>atlas-log4j</type>
+            <replace key="content" find="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" 
replace-with="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.RollingFileAppender&quot;&gt;"/>
+            <replace key="content" find="&lt;logger 
name=&quot;com.thinkaurelius.titan&quot; 
additivity=&quot;false&quot;&gt;&#xA;&#x20;&#x20;&#x20;&#x20;&lt;level 
value=&quot;info&quot;/&gt;" replace-with="&lt;logger 
name=&quot;com.thinkaurelius.titan&quot; 
additivity=&quot;false&quot;&gt;&#xA;&#x20;&#x20;&#x20;&#x20;&lt;level 
value=&quot;warn&quot;/&gt;"/>
+          </definition>
         </changes>
       </component>
       <component name="SPARK_CLIENT">

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 1697604..7074e77 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -476,6 +476,10 @@
         <task xsi:type="configure" 
id="hdp_2_6_atlas_kafka_auto_commit_enable_property_delete"/>
       </execute-stage>
 
+      <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Updating 
logger configurations for Atlas.">
+        <task xsi:type="configure" id="atlas_log4j_update_logger_settings"/>
+      </execute-stage>
+
       <!--KAFKA-->
       <execute-stage service="KAFKA" component="KAFKA_BROKER" 
title="Parameterizing Kafka Log4J Properties">
         <task xsi:type="configure" id="kafka_log4j_parameterize">

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 840b17d..995a1d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -1102,6 +1102,7 @@
           <task xsi:type="configure" id="increase_atlas_zookeeper_timeouts"/>
           <task xsi:type="configure" id="atlas_env_gc_worker"/>
           <task xsi:type="configure" 
id="hdp_2_6_atlas_kafka_auto_commit_enable_property_delete"/>
+          <task xsi:type="configure" id="atlas_log4j_update_logger_settings"/>
         </pre-upgrade>
         <pre-downgrade />
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
index 9e3abcf..8b5cad5 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
@@ -74,7 +74,7 @@
     </layout>
   </appender>
 
-  <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+  <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
     <param name="File" value="{{log_dir}}/application.log"/>
     <param name="Append" value="true"/>
     <param name="MaxFileSize" value="{{atlas_log_max_backup_size}}MB" />
@@ -116,7 +116,7 @@
 
 
   <logger name="com.thinkaurelius.titan" additivity="false">
-    <level value="info"/>
+    <level value="warn"/>
     <appender-ref ref="FILE"/>
   </logger>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index c2c1532..a874fa7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -175,6 +175,11 @@
             <type>application-properties</type>
             <transfer operation="delete" 
delete-key="atlas.kafka.auto.commit.enable"/>
           </definition>
+          <definition xsi:type="configure" 
id="atlas_log4j_update_logger_settings" summary="Updating logger configurations 
for Atlas.">
+            <type>atlas-log4j</type>
+            <replace key="content" find="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" 
replace-with="&lt;appender name=&quot;FILE&quot; 
class=&quot;org.apache.log4j.RollingFileAppender&quot;&gt;"/>
+            <replace key="content" find="&lt;logger 
name=&quot;com.thinkaurelius.titan&quot; 
additivity=&quot;false&quot;&gt;&#x20;&#x20;&#x20;&#x20;&lt;level 
value=&quot;info&quot;/&gt;" replace-with="&lt;logger 
name=&quot;com.thinkaurelius.titan&quot; 
additivity=&quot;false&quot;&gt;&#xA;&#x20;&#x20;&#x20;&#x20;&lt;level 
value=&quot;warn&quot;/&gt;"/>
+          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 86b3956..0d9a746 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -362,6 +362,10 @@
         <task xsi:type="configure" 
id="hdp_2_6_atlas_kafka_auto_commit_enable_property_delete"/>
       </execute-stage>
 
+      <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Updating 
logger configurations for Atlas.">
+        <task xsi:type="configure" id="atlas_log4j_update_logger_settings"/>
+      </execute-stage>
+
       <!-- KMS -->
       <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" 
title="Apply config changes for Ranger Kms plugin">
         <task xsi:type="configure" 
id="hdp_2_6_maint_ranger_kms_plugin_cluster_name"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index b376fa7..b5c88de 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -1035,6 +1035,7 @@
           <task xsi:type="configure" 
id="hdp_2_6_maint_ranger_atlas_plugin_cluster_name"/>
           <task xsi:type="configure" id="atlas_env_gc_worker"/>
           <task xsi:type="configure" 
id="hdp_2_6_atlas_kafka_auto_commit_enable_property_delete"/>
+          <task xsi:type="configure" id="atlas_log4j_update_logger_settings"/>
         </pre-upgrade>
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->
         <upgrade>

Reply via email to