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

bug #1635: Pass correct ds id to delete script

Browse Source
This commit is contained in:
Tino Vazquez 2012-11-12 17:40:53 +01:00
parent e9f3cd6928
commit c662f19399
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/tm/TransferManager.cc
View File

@ -805,26 +805,10 @@ void TransferManager::epilog_transfer_command(
string ds_id;
int disk_id;
if ( isVolatile(disk) == true )
{
save = "NO";
tm_mad = vm->get_tm_mad();
ds_id = vm->get_ds_id();
}
else
{
save = disk->vector_value("SAVE");
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
if ( save.empty() || ds_id.empty() || tm_mad.empty() )
{
return;
}
}
disk->vector_value("DISK_ID", disk_id);
save = disk->vector_value("SAVE");
transform(save.begin(),save.end(),save.begin(),(int(*)(int))toupper);
if ( save == "YES" )
@ -835,6 +819,15 @@ void TransferManager::epilog_transfer_command(
source = disk->vector_value("SOURCE");
save_source = disk->vector_value("SAVE_AS_SOURCE");
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
if ( ds_id.empty() || tm_mad.empty() )
{
vm->log("TM", Log::ERROR, "No DS_ID or TM_MAD to save disk image");
return;
}
if (source.empty() && save_source.empty())
{
vm->log("TM", Log::ERROR, "No SOURCE to save disk image");
@ -860,11 +853,11 @@ void TransferManager::epilog_transfer_command(
{
//DELETE tm_mad hostname:remote_system_dir/disk.i vmid ds_id
xfr << "DELETE "
<< tm_mad << " "
<< vm->get_tm_mad() << " "
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< ds_id
<< vm->get_ds_id()
<< endl;
}
}