Repository: ranger Updated Branches: refs/heads/master 9fea06dbb -> 987a8c036
RANGER-1344: The default sync interval is not enforced correctly for ranger usersync when sync source is AD/LDAP Signed-off-by: Velmurugan Periasamy <v...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/987a8c03 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/987a8c03 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/987a8c03 Branch: refs/heads/master Commit: 987a8c0366c1c6a881a461127b8ac1bdf6d68724 Parents: 9fea06d Author: Sailaja Polavarapu <spolavar...@hortonworks.com> Authored: Thu Feb 2 16:34:29 2017 -0800 Committer: Velmurugan Periasamy <v...@apache.org> Committed: Fri Feb 3 00:09:05 2017 -0500 ---------------------------------------------------------------------- .../ranger/unixusersync/config/UserGroupSyncConfig.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/987a8c03/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java index 3b8b0f6..a4b12b2 100644 --- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java +++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java @@ -453,8 +453,9 @@ public class UserGroupSyncConfig { public long getSleepTimeInMillisBetweenCycle() throws Throwable { String val = prop.getProperty(UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM); + String className = getUserGroupSource().getClass().getName(); if (val == null) { - if (LGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())) { + if (LGSYNC_SOURCE_CLASS.equals(className) || LGSYNC_DELTASYNC_SOURCE_CLASS.equals(className)) { return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE; } else { return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE; @@ -463,9 +464,9 @@ public class UserGroupSyncConfig { else { long ret = Long.parseLong(val); long min_interval; - if (LGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())) { + if (LGSYNC_SOURCE_CLASS.equals(className) || LGSYNC_DELTASYNC_SOURCE_CLASS.equals(className)) { min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE; - }else if(UGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())){ + }else if(UGSYNC_SOURCE_CLASS.equals(className)){ min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE; } else { min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE;
