openstack/deb-openstack-trove
Code Issues Proposed changes

Merge "Fixed error message logging"

Browse Source
This commit is contained in:
Jenkins
2016-05-11 19:33:34 +00:00
committed by Gerrit Code Review
parent 09df9ecd9e 99c72fb48d
commit 38df172ed8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
trove/guestagent/strategies/restore/experimental/couchbase_impl.py
View File

@@ -187,12 +187,11 @@ class CbBackup(base.RestoreRunner):
utils.execute_with_timeout(restore_cmd,
shell=True,
timeout=300)
except exception.ProcessExecutionError as p:
except exception.ProcessExecutionError:
# cbrestore fails or hangs at times:
# http://www.couchbase.com/issues/browse/MB-10832
# Retrying typically works
LOG.error(p)
LOG.error(_("cbrestore failed. Retrying..."))
LOG.exception(_("cbrestore failed. Retrying..."))
utils.execute_with_timeout(restore_cmd,
shell=True,
timeout=300)