Commit eb5c95c3 by Őry Máté

vm: handle TimeLimitExceeded in ShutdownOperation

fixes #278
parent 56542470
...@@ -620,6 +620,17 @@ class ShutdownOperation(InstanceOperation): ...@@ -620,6 +620,17 @@ class ShutdownOperation(InstanceOperation):
self.instance.yield_node() self.instance.yield_node()
self.instance.yield_vnc_port() self.instance.yield_vnc_port()
def on_abort(self, activity, error):
if isinstance(error, TimeLimitExceeded):
activity.result = humanize_exception(ugettext_noop(
"The virtual machine did not switch off in the provided time "
"limit. Most of the time this is caused by incorrect ACPI "
"settings. You can also try to power off the machine from the "
"operating system manually."), error)
activity.resultant_state = None
else:
super(ShutdownOperation, self).on_abort(activity, error)
register_operation(ShutdownOperation) register_operation(ShutdownOperation)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment