Commit 4f1d9ed1 by Bach Dániel

vm: destroy disks if save_as operation fails

parent 64405e13
...@@ -343,6 +343,11 @@ class SaveAsTemplateOperation(InstanceOperation): ...@@ -343,6 +343,11 @@ class SaveAsTemplateOperation(InstanceOperation):
v = 1 v = 1
return "%s v%d" % (name, v) return "%s v%d" % (name, v)
def on_abort(self, activity, error):
if getattr(self, 'disks'):
for disk in self.disks:
def _operation(self, activity, user, system, timeout=300, name=None, def _operation(self, activity, user, system, timeout=300, name=None,
with_shutdown=True, task=None, **kwargs): with_shutdown=True, task=None, **kwargs):
if with_shutdown: if with_shutdown:
...@@ -380,16 +385,20 @@ class SaveAsTemplateOperation(InstanceOperation): ...@@ -380,16 +385,20 @@ class SaveAsTemplateOperation(InstanceOperation):
except Disk.WrongDiskTypeError: except Disk.WrongDiskTypeError:
return disk return disk
self.disks = []
with activity.sub_activity('saving_disks'): with activity.sub_activity('saving_disks'):
disks = [__try_save_disk(disk) for disk in self.instance.disks.all():
for disk in self.instance.disks.all()] self.disks.append(__try_save_disk(disk))
for disk in self.disks:
disk.set_level(user, 'owner')
# create template and do additional setup # create template and do additional setup
tmpl = InstanceTemplate(**params) tmpl = InstanceTemplate(**params)
tmpl.full_clean() # Avoiding database errors. tmpl.full_clean() # Avoiding database errors.
try: try:
tmpl.disks.add(*disks) tmpl.disks.add(*self.disks)
# create interface templates # create interface templates
for i in self.instance.interface_set.all(): for i in self.instance.interface_set.all():
i.save_as_template(tmpl) i.save_as_template(tmpl)
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