Commit 2852c45f by Guba Sándor

instance: get_remote_queue now throws exception on missing self.Node

parent 7843b85d
......@@ -535,7 +535,10 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
"""Get the remote worker queue name of this instance with the specified
queue ID.
return self.node.get_remote_queue_name(queue_id) if self.node else None
if self.node:
return self.node.get_remote_queue_name(queue_id)
raise Node.DoesNotExist()
def renew(self, which='both'):
"""Renew virtual machine instance leases.
......@@ -843,8 +846,9 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
with instance_activity(code_suffix='shutdown', instance=self,
on_abort=__on_abort, on_commit=__on_commit,
task_uuid=task_uuid, user=user):
queue_name = self.get_remote_queue_name('vm')
logger.debug("RPC Shutdown at queue: %s, for vm: %s.",
self.vm_name, queue_name)
self.node = None
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