summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2012-03-16 16:51:03 -0700
committerAnthony Young <sleepsonthefloor@gmail.com>2012-03-16 18:18:46 -0700
commitfe7055a5bd25bef33fe10f4fee858ad8cd30a6ea (patch)
tree25caf16d823f19f4c10b443e69df9f77759bfd76 /nova/exception.py
parenteb42e7fcd7bb67ab951c9bc6c80a78cd23011458 (diff)
downloadnova-fe7055a5bd25bef33fe10f4fee858ad8cd30a6ea.tar.gz
nova-fe7055a5bd25bef33fe10f4fee858ad8cd30a6ea.tar.xz
nova-fe7055a5bd25bef33fe10f4fee858ad8cd30a6ea.zip
Fix run/terminate race conditions.
* synchronize run,terminate,stop,start on instance_uuid * don't surpress error when unfiltering instance, which can result in a zombified instance. * Fixes bug 956719 * Remove debug raise Change-Id: I8b2eaffdabfd5c1a9414adb1b5ed11e4c48711fc
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 0e961730d..eb0bf382c 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -330,6 +330,10 @@ class InstanceRebootFailure(Invalid):
message = _("Failed to reboot instance") + ": %(reason)s"
+class InstanceTerminationFailure(Invalid):
+ message = _("Failed to terminate instance") + ": %(reason)s"
+
+
class ServiceUnavailable(Invalid):
message = _("Service is unavailable at this time.")