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

bug #1740: Use always the Image datastore for DELETE

Browse Source 
(cherry picked from commit ef171ebea8c8f516181f5c44c37b319fdba8ac8b)
This commit is contained in:
Ruben S. Montero 2013-01-29 22:32:42 +01:00
parent 03f77697c4
commit ddca48fd8c
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/tm/TransferManager.cc
View File

@ -945,14 +945,28 @@ void TransferManager::epilog_transfer_command(
}
else //No saving disk
{
//DELETE tm_mad hostname:remote_system_dir/disk.i vmid ds_id
xfr << "DELETE "
<< vm->get_tm_mad() << " "
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< vm->get_ds_id()
<< endl;
if ( isVolatile(disk) == true )
{
tm_mad = vm->get_tm_mad();
ds_id = vm->get_ds_id();
}
else
{
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
}
if ( !tm_mad.empty() && !ds_id.empty() )
{
//DELETE tm_mad hostname:remote_system_dir/disk.i vmid ds_id
xfr << "DELETE "
<< tm_mad << " "
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< ds_id
<< endl;
}
}
}