From 2b51b59f58e8a693bb5e1dde4b814f8dc4c35c8b Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 26 Apr 2013 13:08:55 +0200 Subject: [PATCH] bug #1687: Do not fail after the livemigration is successfull (i.e. on clean, post (network) and post-migrate) --- src/vmm_mad/exec/one_vmm_exec.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb index daba5f6aad..81efd6f6ab 100755 --- a/src/vmm_mad/exec/one_vmm_exec.rb +++ b/src/vmm_mad/exec/one_vmm_exec.rb @@ -467,23 +467,27 @@ class ExecDriver < VirtualMachineDriver :parameters => [:deploy_id, :dest_host, :host] }, # Execute networking clean up operations + # NOTE: VM is now in the new host. If we fail from now on, oned will + # assume that the VM is in the previous host but it is in fact + # migrated. Log errors will be shown in vm.log { :driver => :vnm, - :action => :clean + :action => :clean, + :no_fail => true }, # Execute post-boot networking setup on migrating host { :driver => :vnm, :action => :post, :parameters => [:deploy_id], - :destination => :true - #TODO :fail_action what to do here? cancel VM? + :destination => :true, + :no_fail => true }, { :driver => :tm, :action => :tm_postmigrate, - :parameters => post.split - #TODO :fail_action what to do here? cancel VM? + :parameters => post.split, + :no_fail => true }, ]