Revision a7394113 src/lcm/LifeCycleStates.cc

View differences:

src/lcm/LifeCycleStates.cc
731 731
    {
732 732
        vm->set_state(VirtualMachine::BOOT_UNDEPLOY);
733 733
    }
734
    else if ( lcm_state == VirtualMachine::PROLOG_MIGRATE )
734
    else if ( lcm_state == VirtualMachine::PROLOG_MIGRATE ||
735
              lcm_state == VirtualMachine::PROLOG_MIGRATE_FAILURE )
735 736
    {
736 737
        vm->set_state(VirtualMachine::BOOT_MIGRATE);
737 738
    }
......
780 781

  
781 782
    state = vm->get_lcm_state();
782 783

  
783
    if ( state == VirtualMachine::PROLOG ||
784
         state == VirtualMachine::PROLOG_MIGRATE )
784
    if ( state == VirtualMachine::PROLOG )
785 785
    {
786 786
        vm->set_prolog_etime(the_time);
787 787

  
788 788
        failure_action(vm);
789 789
    }
790
    else if ( state == VirtualMachine::PROLOG_MIGRATE )
791
    {
792
        vm->set_state(VirtualMachine::PROLOG_MIGRATE_FAILURE);
793
        vmpool->update(vm);
794

  
795
        vm->log("LCM", Log::INFO, "New VM state is PROLOG_MIGRATE_FAILURE");
796
    }
790 797
    else if ( state == VirtualMachine::PROLOG_RESUME )
791 798
    {
792 799
        //----------------------------------------------------

Also available in: Unified diff