shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Get rid of unneeded double string-int conversions

Browse Source
This commit is contained in:
Ruben S. Montero 2013-11-22 10:15:57 +01:00
parent a385eb773c
commit 7f2a68c5d5
4 changed files with 69 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/VirtualMachine.h
View File

@ -490,21 +490,6 @@ public:
return previous_history->vnm_mad_name;
};
/**
* Returns the datastore ID of the system DS for the host. The hasHistory()
* function MUST be called before this one.
* @return the ds id
*/
string get_ds_id_st() const
{
ostringstream oss;
oss << history->ds_id;
return oss.str();
};
/**
* Returns the datastore ID of the system DS for the host. The hasHistory()
* function MUST be called before this one.
@ -520,13 +505,9 @@ public:
* The hasPreviousHistory() function MUST be called before this one.
* @return the TM mad name
*/
string get_previous_ds_id() const
int get_previous_ds_id() const
{
ostringstream oss;
oss << previous_history->ds_id;
return oss.str();
return previous_history->ds_id;
};
/**

6
src/rm/RequestManagerVirtualMachine.cc
View File

@ -934,11 +934,7 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
}
// Get System DS information from current History record
istringstream iss(vm->get_ds_id_st());
iss >> c_ds_id;
c_ds_id = vm->get_ds_id();
c_tm_mad = vm->get_tm_mad();
if (enforce)

131
src/tm/TransferManager.cc
View File

@ -380,11 +380,8 @@ int TransferManager::prolog_transfer_command(
string format;
string tm_mad;
string ds_id;
string vm_ds_id;
int disk_id;
vm_ds_id = vm->get_ds_id_st();
int disk_id;
disk->vector_value("DISK_ID", disk_id);
@ -406,14 +403,14 @@ int TransferManager::prolog_transfer_command(
return 0;
}
//MKSWAP tm_mad size host:remote_system_dir/disk.i vmid dsid(=0)
//MKSWAP tm_mad size host:remote_system_dir/disk.i vmid dsid(system)
xfr << "MKSWAP "
<< vm_tm_mad << " "
<< size << " "
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< vm_ds_id
<< vm->get_ds_id()
<< endl;
}
else if ( type == "FS" )
@ -436,7 +433,7 @@ int TransferManager::prolog_transfer_command(
return 0;
}
//MKIMAGE tm_mad size format host:remote_system_dir/disk.i vmid dsid(=0)
//MKIMAGE tm_mad size format host:remote_system_dir/disk.i vmid dsid(system)
xfr << "MKIMAGE "
<< vm_tm_mad << " "
<< size << " "
@ -444,7 +441,7 @@ int TransferManager::prolog_transfer_command(
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< vm_ds_id
<< vm->get_ds_id()
<< endl;
}
else
@ -747,7 +744,7 @@ void TransferManager::prolog_action(int vid)
xfr << vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< vm->get_ds_id_st()
<< vm->get_ds_id()
<< endl;
}
@ -801,9 +798,9 @@ void TransferManager::prolog_migr_action(int vid)
const VectorAttribute * disk;
string tm_mad;
string vm_tm_mad;
string vm_ds_id;
string ds_id;
int disk_id;
int ds_id;
int disk_id;
vector<const Attribute *> attrs;
int num;
@ -829,10 +826,9 @@ void TransferManager::prolog_migr_action(int vid)
}
vm_tm_mad = vm->get_tm_mad();
vm_ds_id = vm->get_ds_id_st();
tm_md = get();
if ( tm_md == 0 || vm_tm_mad.empty() || vm_ds_id.empty())
if ( tm_md == 0 || vm_tm_mad.empty())
{
goto error_drivers;
}
@ -865,20 +861,20 @@ void TransferManager::prolog_migr_action(int vid)
if ( VirtualMachine::isVolatile(disk) == true )
{
tm_mad = vm_tm_mad;
ds_id = vm_ds_id;
ds_id = vm->get_ds_id();
}
else
{
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
tm_mad = disk->vector_value("TM_MAD");
int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
if ( tm_mad.empty() || ds_id.empty() )
if (tm_mad.empty() || vv_rc == -1)
{
continue;
}
}
//MV tm_mad prev_host:remote_system_dir/disk.i host:remote_system_dir/disk.i vmid dsid
//MV tm_mad prev_host:remote_system_dir/disk.i host:remote_system_dir/disk.i vmid dsid(image)
xfr << "MV "
<< tm_mad << " "
<< vm->get_previous_hostname() << ":"
@ -889,7 +885,7 @@ void TransferManager::prolog_migr_action(int vid)
<< ds_id << endl;
}
//MV tm_mad prev_host:remote_system_dir host:remote_system_dir VMID 0
//MV tm_mad prev_host:remote_system_dir host:remote_system_dir VMID dsid(system)
xfr << "MV "
<< vm_tm_mad << " "
<< vm->get_previous_hostname() << ":"
@ -897,7 +893,7 @@ void TransferManager::prolog_migr_action(int vid)
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << " "
<< vm->get_oid() << " "
<< vm_ds_id << endl;
<< vm->get_ds_id() << endl;
xfr.close();
@ -941,9 +937,9 @@ void TransferManager::prolog_resume_action(int vid)
const VectorAttribute * disk;
string tm_mad;
string vm_tm_mad;
string vm_ds_id;
string ds_id;
int disk_id;
int ds_id;
int disk_id;
vector<const Attribute *> attrs;
int num;
@ -969,10 +965,9 @@ void TransferManager::prolog_resume_action(int vid)
}
vm_tm_mad = vm->get_tm_mad();
vm_ds_id = vm->get_ds_id_st();
tm_md = get();
if ( tm_md == 0 || vm_tm_mad.empty() || vm_ds_id.empty())
if ( tm_md == 0 || vm_tm_mad.empty())
{
goto error_drivers;
}
@ -1004,20 +999,20 @@ void TransferManager::prolog_resume_action(int vid)
if ( VirtualMachine::isVolatile(disk) == true )
{
tm_mad = vm_tm_mad;
ds_id = vm_ds_id;
ds_id = vm->get_ds_id();
}
else
{
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
tm_mad = disk->vector_value("TM_MAD");
int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
if ( tm_mad.empty() || ds_id.empty() )
if ( tm_mad.empty() || vv_rc == -1)
{
continue;
}
}
//MV tm_mad fe:system_dir/disk.i host:remote_system_dir/disk.i vmid dsid
//MV tm_mad fe:system_dir/disk.i host:remote_system_dir/disk.i vmid dsid(image)
xfr << "MV "
<< tm_mad << " "
<< nd.get_nebula_hostname() << ":"
@ -1028,13 +1023,13 @@ void TransferManager::prolog_resume_action(int vid)
<< ds_id << endl;
}
//MV tm_mad fe:system_dir host:remote_system_dir vmid 0
//MV tm_mad fe:system_dir host:remote_system_dir vmid dsid(system)
xfr << "MV "
<< vm_tm_mad << " "
<< nd.get_nebula_hostname() << ":"<< vm->get_system_dir() << " "
<< vm->get_hostname() << ":" << vm->get_remote_system_dir()<< " "
<< vm->get_oid() << " "
<< vm_ds_id << endl;
<< vm->get_ds_id() << endl;
xfr.close();
@ -1076,7 +1071,6 @@ void TransferManager::epilog_transfer_command(
{
string save;
string tm_mad;
string ds_id;
int disk_id;
disk->vector_value("DISK_ID", disk_id);
@ -1089,6 +1083,7 @@ void TransferManager::epilog_transfer_command(
{
string source;
string save_source;
string ds_id;
source = disk->vector_value("SOURCE");
save_source = disk->vector_value("SAVE_AS_SOURCE");
@ -1125,18 +1120,21 @@ void TransferManager::epilog_transfer_command(
}
else //No saving disk
{
int ds_id_i;
int vv_rc = 0;
if ( VirtualMachine::isVolatile(disk) == true )
{
tm_mad = vm->get_tm_mad();
ds_id = vm->get_ds_id_st();
ds_id_i= vm->get_ds_id();
}
else
{
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
vv_rc = disk->vector_value("DATASTORE_ID", ds_id_i);
}
if ( !tm_mad.empty() && !ds_id.empty() )
if ( !tm_mad.empty() && vv_rc == 0)
{
//DELETE tm_mad hostname:remote_system_dir/disk.i vmid ds_id
xfr << "DELETE "
@ -1144,7 +1142,7 @@ void TransferManager::epilog_transfer_command(
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << disk_id << " "
<< vm->get_oid() << " "
<< ds_id
<< ds_id_i
<< endl;
}
}
@ -1159,7 +1157,6 @@ void TransferManager::epilog_action(int vid)
ostringstream os;
string xfr_name;
string vm_tm_mad;
string vm_ds_id;
string error_str;
const VectorAttribute * disk;
@ -1188,10 +1185,9 @@ void TransferManager::epilog_action(int vid)
}
vm_tm_mad = vm->get_tm_mad();
vm_ds_id = vm->get_ds_id_st();
tm_md = get();
if ( tm_md == 0 || vm_tm_mad.empty() || vm_ds_id.empty())
if ( tm_md == 0 || vm_tm_mad.empty())
{
goto error_drivers;
}
@ -1226,7 +1222,7 @@ void TransferManager::epilog_action(int vid)
<< vm_tm_mad << " "
<< vm->get_hostname() << ":" << vm->get_remote_system_dir() << " "
<< vm->get_oid() << " "
<< vm_ds_id << endl;
<< vm->get_ds_id() << endl;
xfr.close();
@ -1269,9 +1265,8 @@ void TransferManager::epilog_stop_action(int vid)
string xfr_name;
string tm_mad;
string vm_tm_mad;
string vm_ds_id;
string ds_id;
int ds_id;
int disk_id;
VirtualMachine * vm;
@ -1299,10 +1294,9 @@ void TransferManager::epilog_stop_action(int vid)
}
vm_tm_mad = vm->get_tm_mad();
vm_ds_id = vm->get_ds_id_st();
tm_md = get();
if ( tm_md == 0 || vm_tm_mad.empty() || vm_ds_id.empty())
if (tm_md == 0 || vm_tm_mad.empty())
{
goto error_drivers;
}
@ -1334,20 +1328,20 @@ void TransferManager::epilog_stop_action(int vid)
if ( VirtualMachine::isVolatile(disk) == true )
{
tm_mad = vm_tm_mad;
ds_id = vm_ds_id;
ds_id = vm->get_ds_id();
}
else
{
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
tm_mad = disk->vector_value("TM_MAD");
int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
if ( tm_mad.empty() || ds_id.empty() )
if (tm_mad.empty() || vv_rc == -1)
{
continue;
}
}
//MV tm_mad host:remote_system_dir/disk.i fe:system_dir/disk.i vmid dsid
//MV tm_mad host:remote_system_dir/disk.i fe:system_dir/disk.i vmid dsid(image)
xfr << "MV "
<< tm_mad << " "
<< vm->get_hostname() << ":"
@ -1358,13 +1352,13 @@ void TransferManager::epilog_stop_action(int vid)
<< ds_id << endl;
}
//MV vm_tm_mad hostname:remote_system_dir fe:system_dir
//MV vm_tm_mad hostname:remote_system_dir fe:system_dir vmid dsid(system)
xfr << "MV "
<< vm_tm_mad << " "
<< vm->get_hostname() << ":" << vm->get_remote_system_dir() << " "
<< nd.get_nebula_hostname() << ":" << vm->get_system_dir() << " "
<< vm->get_oid() << " "
<< vm_ds_id << endl;
<< vm->get_ds_id() << endl;
xfr.close();
@ -1410,12 +1404,11 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
string vm_tm_mad;
string tm_mad;
string vm_ds_id;
string ds_id;
string host;
string system_dir;
int ds_id;
int vm_ds_id;
int disk_id;
Nebula& nd = Nebula::instance();
@ -1438,7 +1431,7 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
system_dir = vm->get_system_dir();
vm_tm_mad = vm->get_tm_mad();
vm_ds_id = vm->get_ds_id_st();
vm_ds_id = vm->get_ds_id();
}
else if (previous)
{
@ -1459,10 +1452,10 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
system_dir = vm->get_remote_system_dir();
vm_tm_mad = vm->get_tm_mad();
vm_ds_id = vm->get_ds_id_st();
vm_ds_id = vm->get_ds_id();
}
if ( vm_tm_mad.empty() || vm_ds_id.empty())
if (vm_tm_mad.empty())
{
goto error_drivers;
}
@ -1490,18 +1483,18 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
}
else
{
tm_mad = disk->vector_value("TM_MAD");
ds_id = disk->vector_value("DATASTORE_ID");
tm_mad = disk->vector_value("TM_MAD");
int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
if ( tm_mad.empty() || ds_id.empty() )
if (tm_mad.empty() || vv_rc == -1)
{
continue;
}
}
//DELETE tm_mad host:remote_system_dir/disk.i vmid dsid
// *local* DELETE tm_mad fe:system_dir/disk.i vmid dsid
// *prev* DELETE tm_mad prev_host:remote_system_dir/disk.i vmid ds_id
//DELETE tm_mad host:remote_system_dir/disk.i vmid dsid(image)
// *local* DELETE tm_mad fe:system_dir/disk.i vmid dsid(image)
// *prev* DELETE tm_mad prev_host:remote_system_dir/disk.i vmid ds_id(image)
xfr << "DELETE "
<< tm_mad << " "
<< host << ":"
@ -1510,9 +1503,9 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
<< ds_id << endl;
}
//DELETE vm_tm_mad hostname:remote_system_dir vmid dsid
// *local* DELETE vm_tm_mad fe:system_dir vmid dsid
// *prev* DELTE vm_tm_mad prev_host:remote_system_dir vmid ds_id
//DELETE vm_tm_mad hostname:remote_system_dir vmid dsid(system)
// *local* DELETE vm_tm_mad fe:system_dir vmid dsid(system)
// *prev* DELTE vm_tm_mad prev_host:remote_system_dir vmid ds_id(system)
xfr << "DELETE "
<< vm_tm_mad << " "
<< host <<":"<< system_dir << " "
@ -1956,7 +1949,7 @@ void TransferManager::migrate_transfer_command(
<< vm->get_hostname() << " "
<< vm->get_remote_system_dir() << " "
<< vm->get_oid() << " "
<< vm->get_ds_id_st()
<< vm->get_ds_id()
<< endl;
}

8
src/vmm/LibVirtDriverVMware.cc
View File

@ -276,19 +276,19 @@ int LibVirtDriver::deployment_description_vmware(
if ( type == "BLOCK" )
{
file << "\t\t<disk type='block' device='disk'>" << endl;
file << "\t\t\t<source file='[" << vm->get_ds_id_st() << "] "
file << "\t\t\t<source file='[" << vm->get_ds_id() << "] "
<< vm->get_oid() << "/disk." << disk_id << "'/>" << endl;
}
else if ( type == "CDROM" )
{
file << "\t\t<disk type='file' device='cdrom'>" << endl;
file << "\t\t\t<source file='[" << vm->get_ds_id_st() << "] "
file << "\t\t\t<source file='[" << vm->get_ds_id() << "] "
<< vm->get_oid() << "/disk." << disk_id << ".iso'/>" << endl;
}
else
{
file << "\t\t<disk type='file' device='disk'>" << endl
<< "\t\t\t<source file='[" << vm->get_ds_id_st() <<"] "
<< "\t\t\t<source file='[" << vm->get_ds_id() <<"] "
<< vm->get_oid() << "/disk." << disk_id << "/disk.vmdk'/>" << endl;
}
@ -337,7 +337,7 @@ int LibVirtDriver::deployment_description_vmware(
if ( !target.empty() )
{
file << "\t\t<disk type='file' device='cdrom'>" << endl;
file << "\t\t\t<source file='[" << vm->get_ds_id_st() <<"] "
file << "\t\t\t<source file='[" << vm->get_ds_id() <<"] "
<< vm->get_oid() << "/disk." << disk_id << ".iso'/>" << endl;
file << "\t\t\t<target dev='" << target << "'/>" << endl;
file << "\t\t\t<readonly/>" << endl;