shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Bug #3937: Apply network drivers after disk-snapshot-revert

Browse Source
This commit is contained in:
Jaime Melis 2015-09-02 15:34:20 +02:00
parent 15e75aa91f
commit 40caf75b59
1 changed files with 71 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -955,7 +955,6 @@ class ExecDriver < VirtualMachineDriver
:parameters => [:deploy_id, :checkpoint_file, :host]
},
# network drivers (clean)
# network drivers (pre)
{
:driver => :vnm,
:action => :clean
@ -1021,44 +1020,79 @@ class ExecDriver < VirtualMachineDriver
# Get TM command
tm_command = ensure_xpath(xml_data, id, action, 'TM_COMMAND') || return
# Build the process
if strategy == :detach
pre_action = :detach_disk
pre_params = [:deploy_id, :disk_target_path, target, target_index]
post_action = :attach_disk
post_params = [:deploy_id, :disk_target_path, target, target_index,
drv_message]
else # suspend
pre_action = :save
pre_params = [:deploy_id, :checkpoint_file, :host]
post_action = :restore
post_params = [:checkpoint_file, :host, :deploy_id]
case strategy
when :detach
steps = [
# Save VM state / detach the disk
{
:driver => :vmm,
:action => :detach_disk,
:parameters => [:deploy_id, :disk_target_path, target, target_index]
},
# Do the snapshot
{
:driver => :tm,
:action => :tm_snap_revert,
:parameters => tm_command.split,
:no_fail => true,
},
# Restore VM / attach the disk
{
:driver => :vmm,
:action => :attach_disk,
:parameters => [:deploy_id, :disk_target_path, target, target_index,
drv_message]
}
]
when :suspend
steps = [
# Save VM state / detach the disk
{
:driver => :vmm,
:action => :save,
:parameters => [:deploy_id, :checkpoint_file, :host]
},
# network drivers (clean)
{
:driver => :vnm,
:action => :clean
},
# Do the snapshot
{
:driver => :tm,
:action => :tm_snap_revert,
:parameters => tm_command.split,
:no_fail => true,
},
# network drivers (pre)
{
:driver => :vnm,
:action => :pre
},
# Restore VM / attach the disk
{
:driver => :vmm,
:action => :restore,
:parameters => [:checkpoint_file, :host, :deploy_id]
},
# network drivers (post)
{
:driver => :vnm,
:action => :post,
:parameters => [:deploy_id],
:fail_actions => [
{
:driver => :vmm,
:action => :cancel,
:parameters => [:deploy_id, :host]
}
]
}
]
else
return
end
steps = [
# Save VM state / detach the disk
{
:driver => :vmm,
:action => pre_action,
:parameters => pre_params
},
# Do the snapshot
{
:driver => :tm,
:action => :tm_snap_revert,
:parameters => tm_command.split,
:no_fail => true,
},
# Restore VM / attach the disk
{
:driver => :vmm,
:action => post_action,
:parameters => post_params
}
]
action.run(steps)
end