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

Feature #3264: Init calculate_showback stime from DB values

Browse Source
This commit is contained in:
Carlos Martín 2014-10-30 17:46:44 +01:00
parent be6dfcf8f0
commit 2dfa16ab79
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/VirtualMachinePool.h
View File

@ -298,6 +298,11 @@ private:
* True or false whether to submit new VM on HOLD or not
*/
static bool _submit_on_hold;
/**
* Callback used in calculate_showback
*/
int min_stime_cb(void * _min_stime, int num, char **values, char **names);
};
#endif /*VIRTUAL_MACHINE_POOL_H_*/

28
src/vm/VirtualMachinePool.cc
View File

@ -455,6 +455,18 @@ int VirtualMachinePool::dump_monitoring(
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VirtualMachinePool::min_stime_cb(void * _min_stime, int num, char **values, char **names)
{
if ( num == 0 || values == 0 || values[0] == 0 )
{
return -1;
}
*static_cast<int*>(_min_stime) = atoi(values[0]);
return 0;
}
void VirtualMachinePool::calculate_showback()
{
vector<xmlNodePtr> nodes;
@ -488,14 +500,26 @@ void VirtualMachinePool::calculate_showback()
// Set start and end times for the window to process
//--------------------------------------------------------------------------
// TODO: min and max: from params, or absolute from SQL min(stime) from history
start_time = 1405395340;
// TODO: init from params?
start_time = time(0);
end_time = time(0);
// Set start time to the lowest stime from the history records
set_callback(static_cast<Callbackable::Callback>(&VirtualMachinePool::min_stime_cb),
static_cast<void *>(&start_time));
oss << "SELECT MIN(stime) FROM " << History::table;
rc = db->exec(oss, this);
unset_callback();
//--------------------------------------------------------------------------
// Get accounting history records
//--------------------------------------------------------------------------
oss.str("");
rc = dump_acct(oss, "", start_time, end_time);
ObjectXML xml(oss.str());