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

bug #4048: take out TM ROLLBACK from snap create

Browse Source 
(cherry picked from commit a35b4d483c1abb6e1c40aa8f1f72d407152be16b)
This commit is contained in:
Javi Fontan 2015-11-13 15:38:08 +01:00
parent 6ef6dd4d69
commit 5f63b5dd26
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -906,7 +906,6 @@ class ExecDriver < VirtualMachineDriver
# Get TM command
tm_command = ensure_xpath(xml_data, id, action, 'TM_COMMAND') || return
tm_rollback= xml_data.elements['TM_COMMAND_ROLLBACK'].text.strip
# Build the process
case strategy
@ -944,14 +943,7 @@ class ExecDriver < VirtualMachineDriver
:driver => :vmm,
:action => :attach_disk,
:parameters => [:deploy_id, :disk_target_path, target,
target_index, drv_message],
:fail_actions => [
{
:driver => :tm,
:action => :tm_snap_delete,
:parameters => tm_rollback.split
}
]
target_index, drv_message]
}
]
when :suspend
@ -983,14 +975,7 @@ class ExecDriver < VirtualMachineDriver
{
:driver => :vmm,
:action => :restore,
:parameters => [:checkpoint_file, :host, :deploy_id],
:fail_actions => [
{
:driver => :tm,
:action => :tm_snap_delete,
:parameters => tm_rollback.split
}
]
:parameters => [:checkpoint_file, :host, :deploy_id]
},
# network drivers (post)
{