You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sp...@apache.org on 2017/08/23 21:36:27 UTC
ranger git commit: RANGER-1747: Usersync: LDAP Paged results seems to
be ignored in Ranger -- master branch
Repository: ranger
Updated Branches:
refs/heads/master e0a010f5c -> 5318e2f5f
RANGER-1747: Usersync: LDAP Paged results seems to be ignored in Ranger -- master branch
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/5318e2f5
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/5318e2f5
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/5318e2f5
Branch: refs/heads/master
Commit: 5318e2f5f5610c3765df7971a48d5f3692e3286b
Parents: e0a010f
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Wed Aug 23 14:36:22 2017 -0700
Committer: Sailaja Polavarapu <sp...@hortonworks.com>
Committed: Wed Aug 23 14:36:22 2017 -0700
----------------------------------------------------------------------
.../ldapusersync/process/LdapDeltaUserGroupBuilder.java | 10 +++++++---
.../ranger/ldapusersync/process/LdapUserGroupBuilder.java | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/5318e2f5/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 1204d79..d27a217 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
@@ -84,7 +84,7 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource {
private Set<String> userGroupNameAttributeSet;
private boolean pagedResultsEnabled = true;
- private int pagedResultsSize = 500;
+ private int pagedResultsSize = PAGE_SIZE;
private boolean groupSearchFirstEnabled = false;
private boolean userSearchEnabled = false;
@@ -375,6 +375,7 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource {
byte[] cookie = null;
int counter = 0;
try {
+ int paged = 0;
do {
userSearchResultEnum = ldapContext
.search(userSearchBase[ou], extendedUserSearchFilter,
@@ -545,8 +546,9 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource {
}
// Re-activate paged results
if (pagedResultsEnabled) {
+ LOG.debug(String.format("Fetched paged results round: %s", ++paged));
ldapContext.setRequestControls(new Control[]{
- new PagedResultsControl(PAGE_SIZE, cookie, Control.CRITICAL) });
+ new PagedResultsControl(pagedResultsSize, cookie, Control.CRITICAL) });
}
} while (cookie != null);
LOG.info("LdapDeltaUserGroupBuilder.getUsers() completed with user count: "
@@ -602,6 +604,7 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource {
byte[] cookie = null;
int counter = 0;
try {
+ int paged = 0;
do {
groupSearchResultEnum = ldapContext
.search(groupSearchBase[ou], extendedAllGroupsSearchFilter,
@@ -708,8 +711,9 @@ public class LdapDeltaUserGroupBuilder extends AbstractUserGroupSource {
}
// Re-activate paged results
if (pagedResultsEnabled) {
+ LOG.debug(String.format("Fetched paged results round: %s", ++paged));
ldapContext.setRequestControls(new Control[]{
- new PagedResultsControl(PAGE_SIZE, cookie, Control.CRITICAL) });
+ new PagedResultsControl(pagedResultsSize, cookie, Control.CRITICAL) });
}
} while (cookie != null);
LOG.info("LdapDeltaUserGroupBuilder.getGroups() completed with group count: "
http://git-wip-us.apache.org/repos/asf/ranger/blob/5318e2f5/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
index 3168a19..e62da5b 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
@@ -73,7 +73,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
private Set<String> userGroupNameAttributeSet;
private boolean pagedResultsEnabled = true;
- private int pagedResultsSize = 500;
+ private int pagedResultsSize = PAGE_SIZE;
private boolean groupSearchFirstEnabled;
private boolean userSearchEnabled;
@@ -386,6 +386,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
byte[] cookie = null;
int counter = 0;
try {
+ int paged = 0;
do {
userSearchResultEnum = ldapContext
.search(userSearchBase[ou], extendedUserSearchFilter,
@@ -554,8 +555,9 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
}
// Re-activate paged results
if (pagedResultsEnabled) {
+ LOG.debug(String.format("Fetched paged results round: %s", ++paged));
ldapContext.setRequestControls(new Control[]{
- new PagedResultsControl(PAGE_SIZE, cookie, Control.CRITICAL) });
+ new PagedResultsControl(pagedResultsSize, cookie, Control.CRITICAL) });
}
} while (cookie != null);
LOG.info("LDAPUserGroupBuilder.getUsers() completed with user count: "
@@ -592,6 +594,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
byte[] cookie = null;
int counter = 0;
try {
+ int paged = 0;
do {
if (!groupSearchFirstEnabled) {
if (userInfo == null) {
@@ -697,8 +700,9 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
}
// Re-activate paged results
if (pagedResultsEnabled) {
+ LOG.debug(String.format("Fetched paged results round: %s", ++paged));
ldapContext.setRequestControls(new Control[]{
- new PagedResultsControl(PAGE_SIZE, cookie, Control.CRITICAL) });
+ new PagedResultsControl(pagedResultsSize, cookie, Control.CRITICAL) });
}
} while (cookie != null);
LOG.info("LDAPUserGroupBuilder.getGroups() completed with group count: "