Revision ae32c481 src/vmm/VirtualMachineManager.cc

View differences:

src/vmm/VirtualMachineManager.cc
901 901
    os.str("");
902 902
    os << "cancel_action, error getting driver " << vm->get_vmm_mad();
903 903

  
904
error_common:
905
    if ( vm->get_lcm_state() == VirtualMachine::CANCEL ||
906
         vm->get_lcm_state() == VirtualMachine::UNDEPLOYING ) //not in DELETE
907
    {
908
        Nebula              &ne = Nebula::instance();
909
        LifeCycleManager *  lcm = ne.get_lcm();
904
error_common://LifeCycleManager::cancel_failure_action will check state
905
    Nebula              &ne = Nebula::instance();
906
    LifeCycleManager *  lcm = ne.get_lcm();
910 907

  
911
        lcm->trigger(LifeCycleManager::CANCEL_FAILURE, vid);
912
    }
908
    lcm->trigger(LifeCycleManager::CANCEL_FAILURE, vid);
913 909

  
914 910
    vm->log("VMM", Log::ERROR, os);
915 911
    vm->unlock();

Also available in: Unified diff