Improve LDAP performances when updating records, especially when many user entries exists #1975
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexAubin
changed the title
Salamandar
requested changes
Oct 21, 2024
|
Not sure about your last commits on |
Salamandar
approved these changes
Oct 23, 2024
alexAubin
reviewed
Jan 20, 2025
| @@ -246,7 +246,7 @@ def _apply( | |||
| ldap = _get_ldap_interface() | |||
| ldap.update( | |||
| "cn=admins,ou=sudo", | |||
| {"sudoOption": ["!authenticate"] if passwordless_sudo else []}, | |||
| {"sudoOption": "!authenticate" if passwordless_sudo else set()}, | |||
There was a problem hiding this comment.
Sooo does this mean now the code magically handle the case where the data is a string (and won't interpret a string as a list of char) ?
alexAubin
reviewed
Jan 20, 2025
Comment on lines
488
to
+491
| # If the requested mail address is already as main address or as an alias by this user | ||
| if mail in user["mail"]: | ||
| user["mail"].remove(mail) | ||
| if mail != user["mail"][0]: | ||
| user["mail"].remove(mail) |
There was a problem hiding this comment.
Not sure to fully understand that bit but my brain is not super fresh right now
Comment on lines
516
to
+517
| if mail in user["mail"]: | ||
| user["mail"].remove(mail) | ||
| continue |
There was a problem hiding this comment.
Also not sure to understand this bit
Comment on lines
-446
to
+449
| new_attr_dict["givenName"] = [firstname] # TODO: Validate | ||
| new_attr_dict["cn"] = new_attr_dict["displayName"] = [ | ||
| (firstname + " " + user["sn"][0]).strip() | ||
| ] | ||
| new_attr_dict["givenName"] = firstname # TODO: Validate | ||
| new_attr_dict["cn"] = new_attr_dict["displayName"] = ( | ||
| firstname + " " + user["sn"][0] | ||
| ).strip() |
There was a problem hiding this comment.
There are similar stuff in portal.py's portal_update() that need to be adapted too
| ] | ||
| if new_attr_dict["mail"]: | ||
| new_attr_dict["objectClass"] = set(group["objectClass"]) | ||
| new_attr_dict["objectClass"].update({"mailGroup"}) |
There was a problem hiding this comment.
Suggested change
| new_attr_dict["objectClass"].update({"mailGroup"}) | |
| new_attr_dict["objectClass"].add("mailGroup") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem
With 150 users and 12 apps, a
yunohost user createtake 1minWith 350 users and ~25 apps, a
yunohost user createtake hours maybe days.Solution
Replace
ldap.modlist.modifyModlistby an optimize code that work for yunohost.Test in a dev platforme (with ssd 600Mbps) : the 169th user creation is made in ~3s.
PR Status
Need more test to be sure it doesn't break something...
How to test