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

refactor to improve command determination with error handling

Browse source 
Previous code felt into Unknown server implementation for
MariaDB < 10.4.6
This commit is contained in:
Laurent Indermuehle 2025-03-06 15:19:19 +01:00
parent b1e816ef1e
commit 4d4475b2de
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
plugins/modules/mysql_db.py
View file

@ -387,12 +387,13 @@ def db_dump(module, host, user, password, db_name, target, all_databases, port,
dump_extra_args=None, unsafe_password=False, restrict_config_file=False,
check_implicit_admin=False, pipefail=False):
if server_implementation == 'mysql':
cmd = module.get_bin_path('mysqldump', True)
elif server_implementation == 'mariadb' and LooseVersion(server_version) >= LooseVersion("10.4.6"):
cmd = module.get_bin_path('mariadb-dump', True)
else:
return module.fail_json(msg="Unknown server implementation %s" % server_implementation)
cmd_str = 'mysqldump'
if server_implementation == 'mariadb' and LooseVersion(server_version) >= LooseVersion("10.4.6"):
cmd_str = 'mariadb-dump'
try:
cmd = module.get_bin_path(cmd_str, True)
except Exception as e:
return 1, "", "Error determining dump command: %s" % str(e)
# If defined, mysqldump demands --defaults-extra-file be the first option
if config_file:
@ -490,12 +491,13 @@ def db_import(module, host, user, password, db_name, target, all_databases, port
if not os.path.exists(target):
return module.fail_json(msg="target %s does not exist on the host" % target)
if server_implementation == 'mysql':
cmd = [module.get_bin_path('mysql', True)]
elif server_implementation == 'mariadb' and LooseVersion(server_version) >= LooseVersion("10.4.6"):
cmd = [module.get_bin_path('mariadb', True)]
else:
return module.fail_json(msg="Unknown server implementation %s" % server_implementation)
cmd_str = 'mysql'
if server_implementation == 'mariadb' and LooseVersion(server_version) >= LooseVersion("10.4.6"):
cmd_str = 'mariadb'
try:
cmd = module.get_bin_path(cmd_str, True)
except Exception as e:
return 1, "", "Error determining mysql/mariadb command: %s" % str(e)
# --defaults-file must go first, or errors out
if config_file: