Repository: ranger Updated Branches: refs/heads/ranger-0.7 9381159d6 -> bd0e82555
RANGER-1800: Usersync fails to update users and groups during incremental sync with nested groups and group first search enabled Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/0abed0ef Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/0abed0ef Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/0abed0ef Branch: refs/heads/ranger-0.7 Commit: 0abed0efa16a94a46ca053b5e48f98d423c9f972 Parents: 9381159 Author: Sailaja Polavarapu <[email protected]> Authored: Tue Sep 26 14:16:07 2017 -0700 Committer: Sailaja Polavarapu <[email protected]> Committed: Tue Sep 26 14:16:07 2017 -0700 ---------------------------------------------------------------------- .../ldapusersync/process/LdapDeltaUserGroupBuilder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/0abed0ef/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java index 394bde2..17682ba 100644 --- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java +++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java @@ -349,6 +349,7 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource { } List<String> userList = new ArrayList<>(userSet); String transformGroupName = groupNameTransform(groupName); + LOG.debug("addOrUpdateGroup(): group = " + groupName + " users = " + userList); try { sink.addOrUpdateGroup(transformGroupName, userList); } catch (Throwable t) { @@ -751,8 +752,10 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource { } if (groupHierarchyLevels > 0) { + LOG.debug("deltaSyncGroupTime = " + deltaSyncGroupTime); if (deltaSyncGroupTime > 0) { - goUpGroupHierarchyLdap(groupNameMap.keySet(), groupHierarchyLevels-1); + LOG.info("LdapDeltaUserGroupBuilder.getGroups(): Going through group hierarchy for nested group evaluation for deltasync"); + goUpGroupHierarchyLdap(groupNameMap.keySet(), groupHierarchyLevels-1); } } @@ -942,7 +945,7 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource { } else { groupUserTable.put(gName, originalUserFullName, originalUserFullName); } - + groupNameMap.put(groupEntry.getNameInNamespace().toLowerCase(), gName); } LOG.info("No. of members in the group " + gName + " = " + userCount); }
