You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/11/13 20:37:45 UTC
ambari git commit: AMBARI-13888 - Ranger Usersync Moving From Seconds
to Millis On Stack Upgrade (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 3a84d5f4a -> e39da458b
AMBARI-13888 - Ranger Usersync Moving From Seconds to Millis On Stack Upgrade (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e39da458
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e39da458
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e39da458
Branch: refs/heads/trunk
Commit: e39da458b75535b40f40875938286c09027fc854
Parents: 3a84d5f
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Nov 13 11:37:01 2015 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Nov 13 14:37:33 2015 -0500
----------------------------------------------------------------------
.../RANGER/configuration/ranger-ugsync-site.xml | 2 +-
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 41 +++++++++++---------
.../catalog/UpgradeCatalog_2.2_to_2.3.json | 14 +++----
3 files changed, 30 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e39da458/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
index d61cf20..6b9b0a0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -138,7 +138,7 @@
<property>
<name>ranger.usersync.sleeptimeinmillisbetweensynccycle</name>
- <value>60</value>
+ <value>60000</value>
<description>Sleeptime interval in milliseconds, if < 1000 then default to 30 sec</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e39da458/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 518132e..ecfa031 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
@@ -27,6 +27,7 @@
<type>ranger-env</type>
<set key="xml_configurations_supported" value="true" />
</definition>
+
<definition id="hdp_2_3_0_0_update_ranger_admin" summary="Updating Ranger Admin">
<type>ranger-admin-site</type>
<transfer operation="copy" from-type="ranger-site" from-key="HTTPS_CLIENT_AUTH" to-key="ranger.service.https.attrib.clientAuth" default-value="" />
@@ -56,11 +57,30 @@
<set key="ranger.externalurl" value="{{ranger_external_url}}" />
</definition>
+ <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_site">
+ <type>ranger-site</type>
+ <transfer operation="delete" delete-key="HTTPS_CLIENT_AUTH" />
+ <transfer operation="delete" delete-key="HTTPS_KEYSTORE_FILE" />
+ <transfer operation="delete" delete-key="HTTPS_KEYSTORE_PASS" />
+ <transfer operation="delete" delete-key="HTTPS_KEY_ALIAS" />
+ <transfer operation="delete" delete-key="HTTPS_SERVICE_PORT" />
+ <transfer operation="delete" delete-key="HTTP_ENABLED" />
+ <transfer operation="delete" delete-key="HTTP_SERVICE_PORT" />
+ </definition>
+
+ <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_delete_oracle_home">
+ <type>ranger-env</type>
+ <transfer operation="delete" delete-key="oracle_home" />
+ </definition>
+ </changes>
+ </component>
+
+ <component name="RANGER_USERSYNC">
+ <changes>
<definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync" summary="Updating Ranger Usersync">
<type>ranger-ugsync-site</type>
<transfer operation="copy" from-type="usersync-properties" from-key="CRED_KEYSTORE_FILENAME" to-key="ranger.usersync.credstore.filename" default-value="/etc/ranger/usersync/ugsync.jceks" />
<transfer operation="copy" from-type="usersync-properties" from-key="MIN_UNIX_USER_ID_TO_SYNC" to-key="ranger.usersync.unix.minUserId" default-value="" />
- <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_INTERVAL" to-key="ranger.usersync.sleeptimeinmillisbetweensynccycle" default-value="60000" />
<transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_BIND_DN" to-key="ranger.usersync.ldap.binddn" default-value="" />
<transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_BIND_PASSWORD" to-key="ranger.usersync.ldap.ldapbindpassword" default-value="" mask="true" />
<transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_GROUPNAME_CASE_CONVERSION" to-key="ranger.usersync.ldap.groupname.caseconversion" default-value="" />
@@ -75,6 +95,7 @@
<transfer operation="copy" from-type="usersync-properties" from-key="logdir" to-key="ranger.usersync.logdir" default-value="" />
<transfer operation="copy" from-type="usersync-properties" from-key="SYNC_SOURCE" to-key="ranger.usersync.sync.source" default-value="unix" />
<transfer operation="copy" from-type="usersync-properties" from-key="POLICY_MGR_URL" to-key="ranger.usersync.policymanager.baseURL" default-value="{{ranger_external_url}}" />
+
<set key="ranger.usersync.source.impl.class" value="" />
<set key="ranger.usersync.ldap.searchBase" value="" />
<set key="ranger.usersync.group.memberattributename" value="" />
@@ -85,17 +106,7 @@
<set key="ranger.usersync.group.searchfilter" value="" />
<set key="ranger.usersync.group.searchscope" value="" />
<set key="ranger.usersync.group.usermapsyncenabled" value="" />
- </definition>
-
- <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_site">
- <type>ranger-site</type>
- <transfer operation="delete" delete-key="HTTPS_CLIENT_AUTH" />
- <transfer operation="delete" delete-key="HTTPS_KEYSTORE_FILE" />
- <transfer operation="delete" delete-key="HTTPS_KEYSTORE_PASS" />
- <transfer operation="delete" delete-key="HTTPS_KEY_ALIAS" />
- <transfer operation="delete" delete-key="HTTPS_SERVICE_PORT" />
- <transfer operation="delete" delete-key="HTTP_ENABLED" />
- <transfer operation="delete" delete-key="HTTP_SERVICE_PORT" />
+ <set key="ranger.usersync.sleeptimeinmillisbetweensynccycle" value="60000" />
</definition>
<definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_properties">
@@ -118,12 +129,6 @@
<transfer operation="delete" delete-key="SYNC_SOURCE" />
<transfer operation="delete" delete-key="POLICY_MGR_URL" />
</definition>
-
- <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_delete_oracle_home">
- <type>ranger-env</type>
- <transfer operation="delete" delete-key="oracle_home" />
- </definition>
-
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e39da458/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
index 40c345d..64849f7 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
@@ -1359,8 +1359,14 @@
},
"ranger.usersync.policymanager.baseURL": {
"value": "{{ranger_external_url}}"
+ },
+ "ranger.usersync.sleeptimeinmillisbetweensynccycle": {
+ "value": "60000"
}
},
+ "usersync-properties":{
+ "SYNC_INTERVAL": {"remove": "yes"}
+ },
"webhcat-site":{
"templeton.hive.extra.files": "/usr/hdp/${hdp.version}/tez/conf/tez-site.xml,/usr/hdp/${hdp.version}/tez,/usr/hdp/${hdp.version}/tez/lib"
}
@@ -1568,14 +1574,6 @@
"RANGER"
]
},
- "SYNC_INTERVAL": {
- "map-to": "ranger.usersync.sleeptimeinmillisbetweensynccycle",
- "from-catalog": "usersync-properties",
- "to-catalog": "ranger-ugsync-site",
- "required-services": [
- "RANGER"
- ]
- },
"SYNC_LDAP_BIND_DN": {
"map-to": "ranger.usersync.ldap.binddn",
"from-catalog": "usersync-properties",