From b07e876fb1ea4fad6ab2075206dac4deddf2f2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 7 Nov 2013 18:25:10 +0100 Subject: [PATCH] Bug #2440: Images to be saved-as are only set to ready if the VM is shutdown correctly (epilog phase) --- src/dm/DispatchManagerStates.cc | 8 ++++---- src/vm/VirtualMachine.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dm/DispatchManagerStates.cc b/src/dm/DispatchManagerStates.cc index 41817174e0..1ac3eb0c90 100644 --- a/src/dm/DispatchManagerStates.cc +++ b/src/dm/DispatchManagerStates.cc @@ -203,6 +203,10 @@ void DispatchManager::done_action(int vid) lcm_state == VirtualMachine::CANCEL || lcm_state == VirtualMachine::CLEANUP_DELETE)) { + vm->release_network_leases(); + + vm->release_disk_images(); + vm->set_state(VirtualMachine::DONE); vm->set_state(VirtualMachine::LCM_INIT); @@ -213,10 +217,6 @@ void DispatchManager::done_action(int vid) vm->log("DiM", Log::INFO, "New VM state is DONE"); - vm->release_network_leases(); - - vm->release_disk_images(); - uid = vm->get_uid(); gid = vm->get_gid(); tmpl = vm->clone_template(); diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 873abbc117..0700061790 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -2321,7 +2321,7 @@ void VirtualMachine::release_disk_images() if ( rc == 0 ) { - imagem->release_image(oid, save_as_id, (state == FAILED)); + imagem->release_image(oid, save_as_id, (state != ACTIVE || lcm_state != EPILOG)); } } }