ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-18 16:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix returned value since get_resource_limit is used by other methods

Browse source
This commit is contained in:
Laurent Indermuehle 2023-09-14 18:40:07 +02:00
parent 367a528058
commit 9f34b926bf
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
plugins/module_utils/user.py
View file

@ -799,11 +799,31 @@ def get_resource_limits(module, cursor, user, host):
if not res:
return None
# If all resources are at zero, then the user as no resources limits
if all(value == 0 for value in res.values()):
return None
if isinstance(res, tuple):
current_limits = {
'MAX_QUERIES_PER_HOUR': res[0],
'MAX_UPDATES_PER_HOUR': res[1],
'MAX_CONNECTIONS_PER_HOUR': res[2],
'MAX_USER_CONNECTIONS': res[3],
}
return res
if srv_type == 'mariadb':
current_limits['MAX_STATEMENT_TIME'] = res[4]
# I'm not sure this is useful. Maybe fetchone() always return a
# tuple? But I go so many KeyError 0 errors that I haded this.
if isinstance(res, dict):
current_limits = {
'MAX_QUERIES_PER_HOUR': res.get('MAX_QUERIES_PER_HOUR'),
'MAX_UPDATES_PER_HOUR': res.get('MAX_UPDATES_PER_HOUR'),
'MAX_CONNECTIONS_PER_HOUR': res.get('MAX_CONNECTIONS_PER_HOUR'),
'MAX_USER_CONNECTIONS': res.get('MAX_USER_CONNECTIONS'),
}
if srv_type == 'mariadb':
current_limits['MAX_STATEMENT_TIME'] = res.get('MAX_STATEMENT_TIME')
return current_limits
def match_resource_limits(module, current, desired):
@ -859,12 +879,11 @@ def limit_resources(module, cursor, user, host, resource_limits, check_mode):
module.fail_json(msg="The server version does not match the requirements "
"for resource_limits parameter. See module's documentation.")
cursor.execute("SELECT VERSION()")
if 'mariadb' not in cursor.fetchone()[0].lower():
if get_server_type(cursor) != 'mariadb':
if 'MAX_STATEMENT_TIME' in resource_limits:
module.fail_json(msg="MAX_STATEMENT_TIME resource limit is only supported by MariaDB.")
current_limits = get_resource_limits(cursor, user, host)
current_limits = get_resource_limits(module, cursor, user, host)
needs_to_change = match_resource_limits(module, current_limits, resource_limits)