shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-10 00:58:17 +03:00
Code Releases Wiki Activity

feature #3264: use localtime_r, group 0 can initiate showback calculations, update installer, removed debug code

Browse Source
This commit is contained in:
Ruben S. Montero 2014-11-27 14:52:56 +01:00
parent 4830db0be9
commit 367f863aed
4 changed files with 30 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@ -1461,7 +1461,7 @@ CLI_BIN_FILES="src/cli/onevm \
src/cli/oneflow \
src/cli/oneflow-template \
src/cli/oneacct \
src/cli/oneshowback.rb"
src/cli/oneshowback"
CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
src/cli/etc/onehost.yaml \

16
src/cli/onevm
View File

@ -834,22 +834,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
end
end
START_TIME = {
:name => "start_time",
:short => "-s TIME",
:large => "--start TIME" ,
:description => "Start date for the showback data to process",
:format => Time
}
END_TIME = {
:name => "end_time",
:short => "-e TIME",
:large => "--end TIME" ,
:description => "End date for the showback data to process",
:format => Time
}
# Deprecated commands
deprecated_command(:attachdisk, 'disk-attach')

5
src/rm/RequestManagerVirtualMachine.cc
View File

@ -2234,11 +2234,10 @@ void VirtualMachinePoolCalculateShowback::request_execute(
int rc;
string error_str;
// TODO: do a better auth? allow any user in the oneadmin group?
if ( att.uid != 0 )
if ( att.gid != 0 )
{
failure_response(AUTHORIZATION,
authorization_error("Action reserved for oneadmin only", att),
authorization_error("Action reserved for group 0 only", att),
att);
return;
}

58
src/vm/VirtualMachinePool.cc
View File

@ -472,10 +472,11 @@ int VirtualMachinePool::min_stime_cb(void * _min_stime, int num, char **values,
return 0;
}
// TODO: DEBUG
//==============================================================================
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
string put_time(tm tmp_tm)
#ifdef SBDEBUG
static string put_time(tm tmp_tm)
{
ostringstream oss;
@ -485,12 +486,14 @@ string put_time(tm tmp_tm)
return oss.str();
}
string put_time(time_t t)
static string put_time(time_t t)
{
tm tmp_tm = *localtime(&t);
return put_time(tmp_tm);
}
//==============================================================================
#endif
/* -------------------------------------------------------------------------- */
int VirtualMachinePool::calculate_showback(
int start_month,
@ -526,18 +529,19 @@ int VirtualMachinePool::calculate_showback(
float cpu;
int mem;
// TODO: debug
//=================================================================
#ifdef SBDEBUG
ostringstream debug;
time_t debug_t_0 = time(0);
//=================================================================
#endif
//--------------------------------------------------------------------------
// Set start and end times for the window to process
//--------------------------------------------------------------------------
tzset();
time_t start_time = time(0);
time_t end_time = time(0);
time_t end_time = time(0);
if (start_month != -1 && start_year != -1)
{
@ -593,20 +597,17 @@ int VirtualMachinePool::calculate_showback(
rc = dump_acct(oss, "", start_time, end_time);
ObjectXML xml(oss.str());
oss.str("");
// TODO: debug
//=================================================================
#ifdef SBDEBUG
time_t debug_t_1 = time(0);
//=================================================================
#endif
//--------------------------------------------------------------------------
// Create the monthly time slots
//--------------------------------------------------------------------------
// Reset stime to 1st of month, 00:00
tmp_tm = *localtime(&start_time);
localtime_r(&start_time, &tmp_tm);
tmp_tm.tm_sec = 0;
tmp_tm.tm_min = 0;
@ -634,15 +635,14 @@ int VirtualMachinePool::calculate_showback(
// for the second-to-last slot
showback_slots.push_back(end_time);
// TODO: debug
/*=================================================================
#ifdef SBDDEBUG
for ( slot_it = showback_slots.begin(); slot_it != showback_slots.end(); slot_it++ )
{
debug.str("");
debug << "Slot: " << put_time(*slot_it);
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
}
//================================================================*/
#endif
//--------------------------------------------------------------------------
// Process the history records
@ -665,8 +665,7 @@ int VirtualMachinePool::calculate_showback(
history.xpath(cpu_cost, "/HISTORY/VM/TEMPLATE/CPU_COST", 0);
history.xpath(mem_cost, "/HISTORY/VM/TEMPLATE/MEMORY_COST", 0);
// TODO debug
/*=====================================================================
#ifdef SBDDEBUG
int seq;
history.xpath(seq, "/HISTORY/SEQ", -1);
@ -680,7 +679,7 @@ int VirtualMachinePool::calculate_showback(
<< "mem " << mem;
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
//====================================================================*/
#endif
for ( slot_it = showback_slots.begin(); slot_it != showback_slots.end()-1; slot_it++ )
{
@ -723,10 +722,9 @@ int VirtualMachinePool::calculate_showback(
xml.free_nodes(nodes);
// TODO: debug
//=================================================================
#ifdef SBDEBUG
time_t debug_t_2 = time(0);
//=================================================================
#endif
// Write to DB
@ -765,7 +763,7 @@ int VirtualMachinePool::calculate_showback(
vm->unlock();
}
tmp_tm = *localtime(&vm_month_it->first);
localtime_r(&vm_month_it->first, &tmp_tm);
body.str("");
@ -827,8 +825,7 @@ int VirtualMachinePool::calculate_showback(
n_entries = 0;
}
// TODO: debug
/*=================================================================
#ifdef SBDDEBUG
debug.str("");
debug << "VM " << vm_it->first
@ -838,7 +835,7 @@ int VirtualMachinePool::calculate_showback(
<< " HOURS " << hours;
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
//================================================================*/
#endif
}
}
@ -853,8 +850,7 @@ int VirtualMachinePool::calculate_showback(
}
}
// TODO: debug
/*=================================================================
#ifdef SBDEBUG
time_t debug_t_3 = time(0);
debug.str("");
@ -868,7 +864,7 @@ int VirtualMachinePool::calculate_showback(
debug.str("");
debug << "Time to write to db: " << debug_t_3 - debug_t_2;
NebulaLog::log("SHOWBACK", Log::DEBUG, debug);
//================================================================*/
#endif
return 0;
}