diff options
author | Martin Basti <mbasti@redhat.com> | 2015-11-18 10:31:05 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2015-12-01 08:51:44 +0100 |
commit | 2a1a3c498a71e85193af76a25333ebe9011e6b2a (patch) | |
tree | 1ff5c91e164557dbc33d88599d7609d89d263dcf /ipalib/plugins | |
parent | 21f7584f9f44fdc3dee0f9d038f31edd8ee1aab2 (diff) | |
download | freeipa-2a1a3c498a71e85193af76a25333ebe9011e6b2a.tar.gz freeipa-2a1a3c498a71e85193af76a25333ebe9011e6b2a.tar.xz freeipa-2a1a3c498a71e85193af76a25333ebe9011e6b2a.zip |
Upgrade: increase time limit for upgrades
Default ldap search limit is now 30 sec by default during upgrade.
Limits must be changed for the whole ldap2 connection, because this
connection is used inside update plugins and commands called from
upgrade.
Together with increasing the time limit, also size limit should be
unlimited during upgrade. With sizelimit=None we may get the
TimeExceeded exception from getting default value of the sizelimit from LDAP.
https://fedorahosted.org/freeipa/ticket/5267
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/plugins')
-rw-r--r-- | ipalib/plugins/permission.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index b17b61e69..cbc48f5e8 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -1292,8 +1292,7 @@ class permission_find(baseldap.LDAPSearch): if 'sizelimit' in options: max_entries = options['sizelimit'] else: - config = ldap.get_ipa_config() - max_entries = int(config.single_value['ipasearchrecordslimit']) + max_entries = self.api.Backend.ldap2.size_limit filters = ['(objectclass=ipaPermission)', '(!(ipaPermissionType=V2))'] |