diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-28 22:58:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-28 22:58:03 +0000 |
| commit | 1fc170b3c5b57dc40c4aa9a70d93acedb8555a0b (patch) | |
| tree | bf912cc5176f2d48a017b2618826f48dbd89d4b5 | |
| parent | ded5b51d3c4b93e946de75a12b5d815a385bf84a (diff) | |
| parent | bef369dd1d80e1854f61716e17ac3201966cb8ae (diff) | |
| download | nova-1fc170b3c5b57dc40c4aa9a70d93acedb8555a0b.tar.gz nova-1fc170b3c5b57dc40c4aa9a70d93acedb8555a0b.tar.xz nova-1fc170b3c5b57dc40c4aa9a70d93acedb8555a0b.zip | |
Merge "Deal with unknown instance status."
| -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 |