x/cloudcafe
Code Issues Proposed changes

Fixed failure message and loggin for StatusProgressionVerifier when no retries allowed

Browse Source 
Change-Id: I14b2b5b0ac5982ab43ba2e48406c60ab1fb8299c
This commit is contained in:
Jose Idar 2015-06-29 11:41:29 -05:00
parent 8700ab625d
commit e7ec249fbd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cloudcafe/common/behaviors.py
View File

@ -2,9 +2,11 @@ from time import time, sleep
from math import ceil from math import ceil
from cafe.engine.behaviors import BaseBehavior from cafe.engine.behaviors import BaseBehavior
class StatusProgressionVerifierError(Exception): class StatusProgressionVerifierError(Exception):
pass pass
class StatusProgressionClassUsageError(StatusProgressionVerifierError): class StatusProgressionClassUsageError(StatusProgressionVerifierError):
pass pass
@ -122,7 +124,7 @@ class StatusProgressionVerifier(BaseBehavior):
try: try:
current_status = self.status_call( current_status = self.status_call(
*self.status_call_args, **self.status_call_kwargs) *self.status_call_args, **self.status_call_kwargs)
except Exception as exception: except:
if poll_failure_retries >= poll_failure_retry_limit: if poll_failure_retries >= poll_failure_retry_limit:
msg = ( msg = (
"status_call() for {model_type} '{model_id}' " "status_call() for {model_type} '{model_id}' "
@ -132,13 +134,14 @@ class StatusProgressionVerifier(BaseBehavior):
model_id=self.model_id, model_id=self.model_id,
retries=poll_failure_retries)) retries=poll_failure_retries))
if poll_failure_retry_limit > 0: if poll_failure_retry_limit == 0:
msg = ( msg = (
"status_call() for {model_type} '{model_id}' " "status_call() for {model_type} '{model_id}' "
"failed and was not allowed any " "failed and was not allowed any "
"retries".format( "retries".format(
model_type=self.model_type, model_type=self.model_type,
model_id=self.model_id)) model_id=self.model_id))
self._log.exception('') self._log.exception('')
self._log.error(msg) self._log.error(msg)
raise StatusPollError(msg) raise StatusPollError(msg)
@ -146,7 +149,7 @@ class StatusProgressionVerifier(BaseBehavior):
poll_failure_retries += 1 poll_failure_retries += 1
msg = ( msg = (
"status_call() for {model_type} '{model_id}' " "status_call() for {model_type} '{model_id}' "
"failed. Retry {retry} or {max_retries}".format( "failed. Retry {retry} of {max_retries}".format(
model_type=self.model_type, model_type=self.model_type,
model_id=self.model_id, model_id=self.model_id,
retry=poll_failure_retries, retry=poll_failure_retries,