diff options
| -rw-r--r-- | nova/api/openstack/common.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index eacd9b8cb..4dbfa51ff 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -93,10 +93,15 @@ _STATE_MAP = { def status_from_state(vm_state, task_state='default'): """Given vm_state and task_state, return a status string.""" - task_map = _STATE_MAP.get(vm_state, dict(default='UNKNOWN_STATE')) + task_map = _STATE_MAP.get(vm_state, dict(default='UNKNOWN')) status = task_map.get(task_state, task_map['default']) - LOG.debug("Generated %(status)s from vm_state=%(vm_state)s " - "task_state=%(task_state)s." % locals()) + if status == "UNKNOWN": + LOG.error(_("status is UNKNOWN from vm_state=%(vm_state)s " + "task_state=%(task_state)s. Bad upgrade or db " + "corrupted?") % locals()) + else: + LOG.debug(_("Generated %(status)s from vm_state=%(vm_state)s " + "task_state=%(task_state)s.") % locals()) return status |