cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

postgresql_db - Handle pg_dump return code (#52985)

Browse source 
Handle return code return by pg_dump command

Fixes: #40424
This commit is contained in:
Andrey Klychkov 2019-03-13 15:31:50 +03:00 committed by Abhijeet Kasurde
parent f0ef4dae05
commit d30879a0b7
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/40424_postgresql_db_not_failed_when_dump_err.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- postgresql_db - the module fails not always when pg_dump errors occured (https://github.com/ansible/ansible/issues/40424).

11
lib/ansible/modules/database/postgresql/postgresql_db.py
View file

@ -501,9 +501,16 @@ def main():
try:
rc, stdout, stderr, cmd = method(module, target, target_opts, db, **kw)
if rc != 0:
module.fail_json(msg=stderr, stdout=stdout, rc=rc, cmd=cmd)
module.fail_json(msg='Dump of database %s failed' % db,
stdout=stdout, stderr=stderr, rc=rc, cmd=cmd)
elif stderr and 'warning' not in str(stderr):
module.fail_json(msg='Dump of database %s failed' % db,
stdout=stdout, stderr=stderr, rc=1, cmd=cmd)
else:
module.exit_json(changed=True, msg=stdout, stderr=stderr, rc=rc, cmd=cmd)
module.exit_json(changed=True, msg='Dump of database %s has been done' % db,
stdout=stdout, stderr=stderr, rc=rc, cmd=cmd)
except SQLParseError as e:
module.fail_json(msg=to_native(e), exception=traceback.format_exc())