ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mug...@apache.org
Subject ambari git commit: AMBARI-19773 Enable incremental sync by default for fresh install for Ranger Usersync (mugdha)
Date Tue, 31 Jan 2017 06:13:46 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5251a2257 -> 65be27b59


AMBARI-19773 Enable incremental sync by default for fresh install for Ranger Usersync (mugdha)


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

Branch: refs/heads/branch-2.5
Commit: 65be27b592923bf63942d7d3b4d86766c544a566
Parents: 5251a22
Author: Mugdha Varadkar <mugdha@apache.org>
Authored: Mon Jan 30 14:24:59 2017 +0530
Committer: Mugdha Varadkar <mugdha@apache.org>
Committed: Tue Jan 31 11:43:20 2017 +0530

----------------------------------------------------------------------
 .../RANGER/0.7.0/configuration/ranger-ugsync-site.xml          | 2 +-
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml  | 6 ++++++
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml         | 4 ++++
 .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml  | 6 ++++++
 .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml         | 4 ++++
 .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 6 ++++++
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml         | 3 +++
 .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
 10 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
index 15ee9fd..a994856 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
@@ -19,7 +19,7 @@
   <property>
     <name>ranger.usersync.ldap.deltasync</name>
     <display-name>Incremental Sync</display-name>
-    <value>false</value>
+    <value>true</value>
     <description>Enable Incremental Sync</description>
     <value-attributes>
       <type>value-list</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/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 771c247..73d40fb 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
@@ -319,6 +319,12 @@
             <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}}"/>
           </definition>
+
+          <definition xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade">
+            <type>ranger-ugsync-site</type>
+            <set key="ranger.usersync.ldap.deltasync" value="false"
+              if-type="ranger-ugsync-site" if-key="ranger.usersync.source.impl.class" if-value="org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder"/>
+          </definition>
         </changes>
       </component>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 44362f7..0afa2c9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -526,6 +526,10 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_USERSYNC" title="Apply config
changes for Ranger Usersync">
+        <task xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade"/>
+      </execute-stage>
+
       <execute-stage service="RANGER" component="RANGER_TAGSYNC" title="Parameterizing
Ranger Tagsync Log4J Properties">
         <task xsi:type="configure" id="tagsync_log4j_parameterize">
           <summary>Updating the Ranger tagsync Log4J properties to include parameterizations</summary>

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index daf249c..5d710ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -630,6 +630,7 @@
       <component name="RANGER_USERSYNC">
         <pre-upgrade>
           <task xsi:type="configure" id="usersync_log4j_parameterize" />
+          <task xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade"/>
         </pre-upgrade>
         <pre-downgrade />
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/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 f8183c5..8d80491 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
@@ -212,6 +212,12 @@
             <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}}"/>
           </definition>
+
+          <definition xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade">
+            <type>ranger-ugsync-site</type>
+            <set key="ranger.usersync.ldap.deltasync" value="false"
+              if-type="ranger-ugsync-site" if-key="ranger.usersync.source.impl.class" if-value="org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder"/>
+          </definition>
         </changes>
       </component>
       <component name="RANGER_TAGSYNC">

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index 8a8e1a1..65efb1a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -380,6 +380,10 @@
         <task xsi:type="configure" id="hdp_2_6_0_0_remove_bind_anonymous"/>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_USERSYNC" title="Apply config
changes for Ranger Usersync">
+        <task xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade"/>
+      </execute-stage>
+
       <!-- HDFS -->
       <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for
Hdfs Namenode HA">
         <task xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
index d7c539e..e7c8db8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
@@ -619,6 +619,7 @@
       <component name="RANGER_USERSYNC">
         <pre-upgrade>
           <task xsi:type="configure" id="usersync_log4j_parameterize" />
+          <task xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade"/>
         </pre-upgrade>
         <pre-downgrade />
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/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 2aca9b8..188e6f4 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
@@ -209,6 +209,12 @@
             <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}}"/>
           </definition>
+
+          <definition xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade">
+            <type>ranger-ugsync-site</type>
+            <set key="ranger.usersync.ldap.deltasync" value="false"
+              if-type="ranger-ugsync-site" if-key="ranger.usersync.source.impl.class" if-value="org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder"/>
+          </definition>
         </changes>
       </component>
       <component name="RANGER_TAGSYNC">

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/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 09eb493..1fad885 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
@@ -360,6 +360,9 @@
           <summary>Updating the Ranger tagsync Log4J properties to include parameterizations</summary>
         </task>
       </execute-stage>
+      <execute-stage service="RANGER" component="RANGER_USERSYNC" title="Apply config
changes for Ranger Usersync">
+        <task xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade"/>
+      </execute-stage>
 
       <!--RANGER-KMS-->
       <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Parameterizing
Ranger Kms Log4J Properties">

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/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 6287789..8513930 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
@@ -522,6 +522,7 @@
       <component name="RANGER_USERSYNC">
         <pre-upgrade>
           <task xsi:type="configure" id="usersync_log4j_parameterize" />
+          <task xsi:type="configure" id="hdp_2_6_0_0_disable_delta_sync_during_upgrade"/>
         </pre-upgrade>
         <pre-downgrade />
         <upgrade>


Mime
View raw message