hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [1/2] hadoop git commit: HADOOP-10626. Limit Returning Attributes for LDAP search. Contributed by Jason Hubbard. (cherry picked from commit 8709751e1ee9a2c5553823dcd715bd077052ad7f)
Date Tue, 27 Jan 2015 21:53:59 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8100c8a68 -> 3c8d3816c
  refs/heads/trunk 4e15fc084 -> 8bf6f0b70


HADOOP-10626. Limit Returning Attributes for LDAP search. Contributed by Jason Hubbard.
(cherry picked from commit 8709751e1ee9a2c5553823dcd715bd077052ad7f)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c8d3816
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c8d3816
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3c8d3816

Branch: refs/heads/branch-2
Commit: 3c8d3816c67d5309c56f2ee08876967e34b65ab6
Parents: 8100c8a
Author: Aaron T. Myers <atm@apache.org>
Authored: Tue Jan 27 13:50:45 2015 -0800
Committer: Aaron T. Myers <atm@apache.org>
Committed: Tue Jan 27 13:51:19 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                   | 3 +++
 .../main/java/org/apache/hadoop/security/LdapGroupsMapping.java   | 2 ++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c8d3816/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 43c5fc2..9b841ce 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -144,6 +144,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-4297. Enable Java assertions when running tests.
     (Tsz Wo Nicholas Sze via wheat9)
 
+    HADOOP-10626. Limit Returning Attributes for LDAP search. (Jason Hubbard
+    via atm)
+
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c8d3816/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
index c0c8d2b..d463ac7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
@@ -341,6 +341,8 @@ public class LdapGroupsMapping
 
     int dirSearchTimeout = conf.getInt(DIRECTORY_SEARCH_TIMEOUT, DIRECTORY_SEARCH_TIMEOUT_DEFAULT);
     SEARCH_CONTROLS.setTimeLimit(dirSearchTimeout);
+    // Limit the attributes returned to only those required to speed up the search. See HADOOP-10626
for more details.
+    SEARCH_CONTROLS.setReturningAttributes(new String[] {groupNameAttr});
 
     this.conf = conf;
   }


Mime
View raw message