Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 c94611285 -> af16726a9


AMBARI-21889 MaxBackupIndex does not work with DailyRollingFileAppender in 
Ranger (mugdha)


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

Branch: refs/heads/branch-2.6
Commit: af16726a920ec2d540e817d7c11546ebe824ac2d
Parents: c946112
Author: Mugdha Varadkar <mug...@apache.org>
Authored: Fri Sep 8 14:01:55 2017 +0530
Committer: Mugdha Varadkar <mug...@apache.org>
Committed: Fri Sep 8 14:17:20 2017 +0530

----------------------------------------------------------------------
 .../RANGER/0.6.0/configuration/admin-log4j.xml         |  1 -
 .../RANGER/0.6.0/configuration/tagsync-log4j.xml       |  3 +--
 .../RANGER/0.6.0/configuration/usersync-log4j.xml      |  3 +--
 .../RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml   |  6 ++----
 .../BigInsights/4.2.5/upgrades/config-upgrade.xml      | 13 ++++---------
 .../stacks/BigInsights/4.2/upgrades/config-upgrade.xml |  6 ++----
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml         |  6 ++----
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml         |  6 ++----
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml         | 13 ++++---------
 9 files changed, 18 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
index 6108c36..01f4c39 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
@@ -75,7 +75,6 @@ log4j.appender.xa_log_appender.append=true
 log4j.appender.xa_log_appender.layout=org.apache.log4j.PatternLayout
 log4j.appender.xa_log_appender.layout.ConversionPattern=%d [%t] %-5p %C{6} 
(%F:%L) - %m%n
 log4j.appender.xa_log_appender.MaxFileSize={{ranger_xa_log_maxfilesize}}MB
-log4j.appender.xa_log_appender.MaxBackupIndex={{ranger_xa_log_maxbackupindex}}
 
 # xa_log_appender : category and additivity
 log4j.category.org.springframework=warn,xa_log_appender

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
index 6384302..e84aa87 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
@@ -71,8 +71,7 @@ 
log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.logFile.file=${logdir}/tagsync.log
 log4j.appender.logFile.datePattern='.'yyyy-MM-dd
 log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logFile.MaxFileSize = {{ranger_tagsync_log_maxfilesize}}MB
-log4j.appender.logFile.MaxBackupIndex = 
{{ranger_tagsync_log_number_of_backup_files}}
+log4j.appender.logFile.MaxFileSize={{ranger_tagsync_log_maxfilesize}}MB
 log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p 
%c{1} [%t] - %L %m%n
 
 # console

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
index 8843a2a..04297ab 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
@@ -71,8 +71,7 @@ log4j.appender.logFile.file=${logdir}/usersync.log
 log4j.appender.logFile.datePattern='.'yyyy-MM-dd
 log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
 log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p 
%c{1} [%t] - %m%n
-log4j.appender.logFile.MaxFileSize = {{ranger_usersync_log_maxfilesize}}MB
-log4j.appender.logFile.MaxBackupIndex = {{ranger_usersync_log_maxbackupindex}}
+log4j.appender.logFile.MaxFileSize={{ranger_usersync_log_maxfilesize}}MB
 
 # console
 log4j.appender.console=org.apache.log4j.ConsoleAppender

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
index bac2e84..7f4b9d0 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
@@ -89,8 +89,7 @@ log4j.appender.kms.File=${kms.log.dir}/kms.log
 log4j.appender.kms.Append=true
 log4j.appender.kms.layout=org.apache.log4j.PatternLayout
 log4j.appender.kms.layout.ConversionPattern=%d{ISO8601} %-5p %c{1} - %m%n
-log4j.appender.kms.MaxFileSize = {{ranger_kms_log_maxfilesize}}MB
-log4j.appender.kms.MaxBackupIndex = {{ranger_kms_log_maxbackupindex}}
+log4j.appender.kms.MaxFileSize={{ranger_kms_log_maxfilesize}}MB
 
 log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.kms-audit.DatePattern='.'yyyy-MM-dd
@@ -98,8 +97,7 @@ log4j.appender.kms-audit.File=${kms.log.dir}/kms-audit.log
 log4j.appender.kms-audit.Append=true
 log4j.appender.kms-audit.layout=org.apache.log4j.PatternLayout
 log4j.appender.kms-audit.layout.ConversionPattern=%d{ISO8601} %m%n
-log4j.appender.kms-audit.MaxFileSize = {{ranger_kms_audit_log_maxfilesize}}MB
-log4j.appender.kms-audit.MaxBackupIndex = 
{{ranger_kms_audit_log_maxbackupindex}}
+log4j.appender.kms-audit.MaxFileSize={{ranger_kms_audit_log_maxfilesize}}MB
 
 log4j.logger.kms-audit=INFO, kms-audit
 log4j.additivity.kms-audit=false

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
index 3c6f533..d712389 100644
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
@@ -171,7 +171,6 @@
             <set key="ranger_xa_log_maxfilesize" value="256"/>
             <set key="ranger_xa_log_maxbackupindex" value="20"/>
             <replace key="content" 
find="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.xa_log_appender.MaxFileSize={{ranger_xa_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.xa_log_appender.MaxBackupIndex={{ranger_xa_log_maxbackupindex}}"/>
           </definition>
         </changes>
       </component>
@@ -181,8 +180,7 @@
             <type>usersync-log4j</type>
             <set key="ranger_usersync_log_maxfilesize" value="256"/>
             <set key="ranger_usersync_log_maxbackupindex" value="20"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize
 = {{ranger_usersync_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxBackupIndex
 = {{ranger_usersync_log_maxbackupindex}}"/>
+            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize={{ranger_usersync_log_maxfilesize}}MB"/>
           </definition>
 
           <definition xsi:type="configure" 
id="hdp_2_6_0_0_disable_delta_sync_during_upgrade">
@@ -198,8 +196,7 @@
             <type>tagsync-log4j</type>
             <set key="ranger_tagsync_log_maxfilesize" value="256"/>
             <set key="ranger_tagsync_log_number_of_backup_files" value="20"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize
 = {{ranger_tagsync_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxBackupIndex
 = {{ranger_tagsync_log_number_of_backup_files}}"/>
+            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize={{ranger_tagsync_log_maxfilesize}}MB"/>
           </definition>
         </changes>
       </component>
@@ -213,10 +210,8 @@
           <set key="ranger_kms_log_maxbackupindex" value="20"/>
           <set key="ranger_kms_audit_log_maxfilesize" value="256"/>
           <set key="ranger_kms_audit_log_maxbackupindex" value="20"/>
-          <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize
 = {{ranger_kms_log_maxfilesize}}MB"/>
-          <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxBackupIndex
 = {{ranger_kms_log_maxbackupindex}}"/>
-          <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize
 = {{ranger_kms_audit_log_maxfilesize}}MB"/>
-          <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxBackupIndex
 = {{ranger_kms_audit_log_maxbackupindex}}"/>
+          <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize={{ranger_kms_log_maxfilesize}}MB"/>
+          <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize={{ranger_kms_audit_log_maxfilesize}}MB"/>
         </definition>
         <definition xsi:type="configure" 
id="hdp_2_6_0_0_remove_ranger_kms_duplicate_ssl">
           <type>ranger-kms-site</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
index c9f6f53..351393c 100644
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
@@ -89,10 +89,8 @@
             <set key="ranger_kms_log_maxbackupindex" value="20"/>
             <set key="ranger_kms_audit_log_maxfilesize" value="256"/>
             <set key="ranger_kms_audit_log_maxbackupindex" value="20"/>
-            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize
 = {{ranger_kms_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxBackupIndex
 = {{ranger_kms_log_maxbackupindex}}"/>
-            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize
 = {{ranger_kms_audit_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxBackupIndex
 = {{ranger_kms_audit_log_maxbackupindex}}"/>
+            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize={{ranger_kms_log_maxfilesize}}MB"/>
+            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize={{ranger_kms_audit_log_maxfilesize}}MB"/>
           </definition>
           <definition xsi:type="configure" 
id="hdp_2_6_0_0_remove_ranger_kms_duplicate_ssl">
             <type>ranger-kms-site</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 0c4106e..2ac60ff 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -326,10 +326,8 @@
             <set key="ranger_kms_log_maxbackupindex" value="20"/>
             <set key="ranger_kms_audit_log_maxfilesize" value="256"/>
             <set key="ranger_kms_audit_log_maxbackupindex" value="20"/>
-            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize
 = {{ranger_kms_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxBackupIndex
 = {{ranger_kms_log_maxbackupindex}}"/>
-            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize
 = {{ranger_kms_audit_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxBackupIndex
 = {{ranger_kms_audit_log_maxbackupindex}}"/>
+            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize={{ranger_kms_log_maxfilesize}}MB"/>
+            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize={{ranger_kms_audit_log_maxfilesize}}MB"/>
           </definition>
           <definition xsi:type="configure" 
id="hdp_2_6_0_0_remove_ranger_kms_duplicate_ssl">
             <type>ranger-kms-site</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 3e62fb1..1ae77c3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -215,10 +215,8 @@
             <set key="ranger_kms_log_maxbackupindex" value="20"/>
             <set key="ranger_kms_audit_log_maxfilesize" value="256"/>
             <set key="ranger_kms_audit_log_maxbackupindex" value="20"/>
-            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize
 = {{ranger_kms_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxBackupIndex
 = {{ranger_kms_log_maxbackupindex}}"/>
-            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize
 = {{ranger_kms_audit_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxBackupIndex
 = {{ranger_kms_audit_log_maxbackupindex}}"/>
+            <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize={{ranger_kms_log_maxfilesize}}MB"/>
+            <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize={{ranger_kms_audit_log_maxfilesize}}MB"/>
           </definition>
           <definition xsi:type="configure" 
id="hdp_2_6_0_0_remove_ranger_kms_duplicate_ssl">
             <type>ranger-kms-site</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af16726a/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 970e19f..4d1e004 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
@@ -317,7 +317,6 @@
             <set key="ranger_xa_log_maxfilesize" value="256"/>
             <set key="ranger_xa_log_maxbackupindex" value="20"/>
             <replace key="content" 
find="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.xa_log_appender.MaxFileSize={{ranger_xa_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.xa_log_appender.MaxBackupIndex={{ranger_xa_log_maxbackupindex}}"/>
           </definition>
         </changes>
       </component>
@@ -327,8 +326,7 @@
             <type>usersync-log4j</type>
             <set key="ranger_usersync_log_maxfilesize" value="256"/>
             <set key="ranger_usersync_log_maxbackupindex" value="20"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize
 = {{ranger_usersync_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxBackupIndex
 = {{ranger_usersync_log_maxbackupindex}}"/>
+            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize={{ranger_usersync_log_maxfilesize}}MB"/>
           </definition>
 
           <definition xsi:type="configure" 
id="hdp_2_6_0_0_disable_delta_sync_during_upgrade">
@@ -344,8 +342,7 @@
             <type>tagsync-log4j</type>
             <set key="ranger_tagsync_log_maxfilesize" value="256"/>
             <set key="ranger_tagsync_log_number_of_backup_files" value="20"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize
 = {{ranger_tagsync_log_maxfilesize}}MB"/>
-            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxBackupIndex
 = {{ranger_tagsync_log_number_of_backup_files}}"/>
+            <replace key="content" 
find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.logFile.MaxFileSize={{ranger_tagsync_log_maxfilesize}}MB"/>
           </definition>
         </changes>
       </component>
@@ -359,10 +356,8 @@
         <set key="ranger_kms_log_maxbackupindex" value="20"/>
         <set key="ranger_kms_audit_log_maxfilesize" value="256"/>
         <set key="ranger_kms_audit_log_maxbackupindex" value="20"/>
-        <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize
 = {{ranger_kms_log_maxfilesize}}MB"/>
-        <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxBackupIndex
 = {{ranger_kms_log_maxbackupindex}}"/>
-        <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize
 = {{ranger_kms_audit_log_maxfilesize}}MB"/>
-        <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxBackupIndex
 = {{ranger_kms_audit_log_maxbackupindex}}"/>
+        <replace key="content" 
find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms.MaxFileSize={{ranger_kms_log_maxfilesize}}MB"/>
+        <replace key="content" 
find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" 
replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.kms-audit.MaxFileSize={{ranger_kms_audit_log_maxfilesize}}MB"/>
       </definition>
       <definition xsi:type="configure" 
id="hdp_2_6_0_0_remove_ranger_kms_duplicate_ssl">
         <type>ranger-kms-site</type>

Reply via email to