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

Feature #3264: HUGE performance improvement for oneshowback calculate

Browse Source
This commit is contained in:
Carlos Martín 2014-11-07 18:27:22 +01:00
parent 3725a640ec
commit 78f6bd613d
1 changed files with 74 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/vm/VirtualMachinePool.cc
View File

@ -528,6 +528,7 @@ void VirtualMachinePool::calculate_showback(
// TODO: debug // TODO: debug
//================================================================= //=================================================================
ostringstream debug; ostringstream debug;
time_t debug_t_0 = time(0);
//================================================================= //=================================================================
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -591,6 +592,13 @@ void VirtualMachinePool::calculate_showback(
rc = dump_acct(oss, "", start_time, end_time); rc = dump_acct(oss, "", start_time, end_time);
ObjectXML xml(oss.str()); ObjectXML xml(oss.str());
oss.str("");
// TODO: debug
//=================================================================
time_t debug_t_1 = time(0);
//=================================================================
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// Create the monthly time slots // Create the monthly time slots
@ -626,7 +634,7 @@ void VirtualMachinePool::calculate_showback(
showback_slots.push_back(end_time); showback_slots.push_back(end_time);
// TODO: debug // TODO: debug
//*================================================================= /*=================================================================
for ( slot_it = showback_slots.begin(); slot_it != showback_slots.end(); slot_it++ ) for ( slot_it = showback_slots.begin(); slot_it != showback_slots.end(); slot_it++ )
{ {
debug.str(""); debug.str("");
@ -714,8 +722,19 @@ void VirtualMachinePool::calculate_showback(
xml.free_nodes(nodes); xml.free_nodes(nodes);
// TODO: debug
//=================================================================
time_t debug_t_2 = time(0);
//=================================================================
// Write to DB // Write to DB
oss.str("");
oss << "REPLACE INTO " << VirtualMachine::showback_table
<< " ("<< VirtualMachine::showback_db_names <<") VALUES ";
int n_entries = 0;
for ( vm_it = vm_cost.begin(); vm_it != vm_cost.end(); vm_it++ ) for ( vm_it = vm_cost.begin(); vm_it != vm_cost.end(); vm_it++ )
{ {
map<time_t, pair<float,float> >& totals = vm_it->second; map<time_t, pair<float,float> >& totals = vm_it->second;
@ -765,8 +784,6 @@ void VirtualMachinePool::calculate_showback(
<< "<HOURS>" << hours << "</HOURS>" << "<HOURS>" << hours << "</HOURS>"
<< "</SHOWBACK>"; << "</SHOWBACK>";
oss.str("");
sql_body = db->escape_str(body.str().c_str()); sql_body = db->escape_str(body.str().c_str());
if ( sql_body == 0 ) if ( sql_body == 0 )
@ -774,20 +791,41 @@ void VirtualMachinePool::calculate_showback(
// TODO // TODO
} }
if (n_entries == 0)
{
oss.str("");
oss << "REPLACE INTO " << VirtualMachine::showback_table oss << "REPLACE INTO " << VirtualMachine::showback_table
<< " ("<< VirtualMachine::showback_db_names <<") VALUES (" << " ("<< VirtualMachine::showback_db_names <<") VALUES ";
<< vm_it->first << "," }
else
{
oss << ",";
}
oss << " (" << vm_it->first << ","
<< tmp_tm.tm_year + 1900 << "," << tmp_tm.tm_year + 1900 << ","
<< tmp_tm.tm_mon + 1 << "," << tmp_tm.tm_mon + 1 << ","
<< "'" << sql_body << "')"; << "'" << sql_body << "')";
db->free_str(sql_body); db->free_str(sql_body);
n_entries++;
// To avoid the oss to grow indefinitely, flush contents
if (n_entries == 1000)
{
rc = db->exec(oss); rc = db->exec(oss);
if (rc != 0)
{
// TODO
}
n_entries = 0;
}
// TODO: debug // TODO: debug
//*================================================================= /*=================================================================
debug.str(""); debug.str("");
debug << "VM " << vm_it->first debug << "VM " << vm_it->first
@ -800,4 +838,31 @@ void VirtualMachinePool::calculate_showback(
//================================================================*/ //================================================================*/
} }
} }
if (n_entries > 0)
{
rc = db->exec(oss);
if (rc != 0)
{
// TODO
}
}
// TODO: debug
/*=================================================================
time_t debug_t_3 = time(0);
debug.str("");
debug << "Time to dump acct to mem: " << debug_t_1 - debug_t_0;
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
debug.str("");
debug << "Time to process numbers: " << debug_t_2 - debug_t_1;
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
debug.str("");
debug << "Time to write to db: " << debug_t_3 - debug_t_2;
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
//================================================================*/
} }