Skip to content

Commit

Permalink
F OpenNebula#2111: Optimize VM history handling (OpenNebula#3243)
Browse files Browse the repository at this point in the history 
- oned load only last 2 history records (not the full list)
- Dump all history records only if needed in VirtualMachine::to_xml.
- Dump conforms XML schecam and removes VM template from history records.

Speed up of onevm show command:
  - for small SQLite DB is for VM with 500 histories: 130 ms down to 5 ms
  - for big MySQL DB VM with 687 histories: 1000 ms down to 200 ms

Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
  • Loading branch information
@paczerny @feldsam
paczerny authored and feldsam committed Nov 5, 2024
1 parent 4a43cd4 commit f5416df
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 82 deletions.
14 changes: 7 additions & 7 deletions include/VirtualMachine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@ class VirtualMachine : public PoolObjectSQL
// ------------------------------------------------------------------------
// History
// ------------------------------------------------------------------------
/*
* Loads all VM history recordsfrom the database
*/
int load_history(SqlDB * db);

/**
* Adds a new history record an writes it in the database.
*/
Expand Down Expand Up @@ -1837,17 +1842,12 @@ class VirtualMachine : public PoolObjectSQL
/**
* History record, for the current host
*/
History * history;
std::unique_ptr<History> history;

/**
* History record, for the previous host
*/
History * previous_history;

/**
* Complete set of history records for the VM
*/
std::vector<History *> history_records;
std::unique_ptr<History> previous_history;

/**
* VirtualMachine disks
Expand Down
10 changes: 10 additions & 0 deletions include/VirtualMachinePool.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,16 @@ class VirtualMachinePool : public PoolSQL
*/
VirtualMachineMonitorInfo get_monitoring(int vmid);

/**
* Dumps the VM history records in XML format
*
* @param oss the output stream to dump the pool contents
* @param vid the Virtual Machine ID
*
* @return 0 on success
*/
int dump_history(std::string& oss, int vid);

/**
* Processes all the history records, and stores the monthly cost for each
* VM
Expand Down
5 changes: 0 additions & 5 deletions src/vm/History.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,6 @@ int History::select(SqlDB * db)
rc = -1;
}

if ( rc == 0 ) // Regenerate non-persistent data
{
non_persistent_data();
}

return rc;
}

Expand Down
117 changes: 47 additions & 70 deletions src/vm/VirtualMachine.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ VirtualMachine::VirtualMachine(int id,
stime(time(0)),
etime(0),
deploy_id(""),
history(0),
previous_history(0),
disks(false),
nics(false),
_log(0)
Expand All @@ -80,11 +78,6 @@ VirtualMachine::VirtualMachine(int id,

VirtualMachine::~VirtualMachine()
{
for (unsigned int i=0 ; i < history_records.size() ; i++)
{
delete history_records[i];
}

delete _log;
}

Expand Down Expand Up @@ -515,7 +508,7 @@ int VirtualMachine::select(SqlDB * db)

string system_dir;
int rc;
int last_seq;
int seq;

Nebula& nd = Nebula::instance();

Expand All @@ -528,35 +521,15 @@ int VirtualMachine::select(SqlDB * db)
}

//Get History Records.
if ( hasHistory() )
if (history && history->select(db) != 0)
{
last_seq = history->seq;

delete history_records[last_seq];

for (int i = last_seq; i >= 0; i--)
{
History * hp;

hp = new History(oid, i);
history_records[i] = hp;

rc = hp->select(db);

if ( rc != 0)
{
goto error_previous_history;
}

if ( i == last_seq )
{
history = hp;
}
else if ( i == last_seq - 1 )
{
previous_history = hp;
}
}
seq = history->seq;
goto error_common;
}
if (previous_history && previous_history->select(db) != 0)
{
seq = previous_history->seq;
goto error_common;
}

if ( state == DONE ) //Do not recreate dirs. They may be deleted
Expand Down Expand Up @@ -616,10 +589,8 @@ int VirtualMachine::select(SqlDB * db)

return 0;

error_previous_history:
ose << "Cannot get previous history record (seq:" << history->seq
<< ") for VM id: " << oid;

error_common:
ose << "Error loading history for VM " << oid << " seq " << seq;
log("ONE", Log::ERROR, ose);
return -1;
}
Expand Down Expand Up @@ -1901,31 +1872,28 @@ void VirtualMachine::add_history(
int seq;
string vm_xml;

if (history == 0)
if (!history)
{
seq = 0;
}
else
{
seq = history->seq + 1;

previous_history = history;
previous_history = move(history);
}

to_xml_extended(vm_xml, 0);

history = new History(oid, seq, hid, hostname, cid, vmm_mad, tm_mad, ds_id,
history = make_unique<History>(oid, seq, hid, hostname, cid, vmm_mad, tm_mad, ds_id,
vm_xml);

history_records.push_back(history);
};

/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */

void VirtualMachine::cp_history()
{
History * htmp;
string vm_xml;

if (history == 0)
Expand All @@ -1935,7 +1903,7 @@ void VirtualMachine::cp_history()

to_xml_extended(vm_xml, 0);

htmp = new History(oid,
auto htmp = make_unique<History>(oid,
history->seq + 1,
history->hid,
history->hostname,
Expand All @@ -1945,10 +1913,8 @@ void VirtualMachine::cp_history()
history->ds_id,
vm_xml);

previous_history = history;
history = htmp;

history_records.push_back(history);
previous_history = move(history);
history = move(htmp);
}

/* -------------------------------------------------------------------------- */
Expand All @@ -1959,14 +1925,14 @@ void VirtualMachine::cp_previous_history()
History * htmp;
string vm_xml;

if ( previous_history == 0 || history == 0)
if ( !previous_history || !history )
{
return;
}

to_xml_extended(vm_xml, 0);

htmp = new History(oid,
auto htmp = make_unique<History>(oid,
history->seq + 1,
previous_history->hid,
previous_history->hostname,
Expand All @@ -1976,10 +1942,8 @@ void VirtualMachine::cp_previous_history()
previous_history->ds_id,
vm_xml);

previous_history = history;
history = htmp;

history_records.push_back(history);
previous_history = move(history);
history = move(htmp);
}

/* -------------------------------------------------------------------------- */
Expand Down Expand Up @@ -2256,7 +2220,6 @@ string& VirtualMachine::to_xml_extended(string& xml, int n_history) const
{
string template_xml;
string user_template_xml;
string history_xml;
string perm_xml;
string snap_xml;
string lock_str;
Expand Down Expand Up @@ -2287,21 +2250,37 @@ string& VirtualMachine::to_xml_extended(string& xml, int n_history) const

if ( hasHistory() && n_history > 0 )
{
oss << "<HISTORY_RECORDS>";
string history_xml;

if ( n_history == 2 )
{
for (unsigned int i=0; i < history_records.size(); i++)
if (history && history->seq > 1)
{
oss << history_records[i]->to_xml(history_xml);
// Dump the full history record
auto vmpool = Nebula::instance().get_vmpool();
vmpool->dump_history(history_xml, oid);

// Remove the VM from the history to reduce size and comply with xml-schema
ObjectXML obj(history_xml);
obj.remove_nodes("/HISTORY_RECORDS/HISTORY/VM");

oss << obj;
}
else
{
oss << "<HISTORY_RECORDS>";
if (previous_history) oss << previous_history->to_xml(history_xml);
if (history) oss << history->to_xml(history_xml);
oss << "</HISTORY_RECORDS>";
}
}
else
{
oss << "<HISTORY_RECORDS>";
oss << history->to_xml(history_xml);
oss << "</HISTORY_RECORDS>";
}

oss << "</HISTORY_RECORDS>";
}
else
{
Expand Down Expand Up @@ -2459,7 +2438,7 @@ string& VirtualMachine::to_xml_short(string& xml)
if ( hasHistory() )
{
oss << "<HISTORY_RECORDS>";
oss << history_records[history_records.size() - 1]->to_xml_short(history_xml);
oss << history->to_xml_short(history_xml);
oss << "</HISTORY_RECORDS>";
}
else
Expand Down Expand Up @@ -2591,16 +2570,14 @@ int VirtualMachine::from_xml(const string &xml_str)
if ( xpath(last_seq,"/VM/HISTORY_RECORDS/HISTORY/SEQ", -1) == 0 &&
last_seq != -1 )
{
history_records.resize(last_seq + 1);
history = make_unique<History>(oid, last_seq);

for (int i=0; i <= last_seq; ++i)
// Initialize previous history
--last_seq;
if (last_seq >= 0)
{
history_records[i] = 0;
previous_history = make_unique<History>(oid, last_seq);
}

history = new History(oid, last_seq);

history_records[last_seq] = history;
}

// -------------------------------------------------------------------------
Expand Down
13 changes: 13 additions & 0 deletions src/vm/VirtualMachinePool.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,19 @@ int VirtualMachinePool::dump_monitoring(
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */

int VirtualMachinePool::dump_history(std::string& oss, int vid)
{
ostringstream cmd;

cmd << "SELECT body FROM " << one_db::history_table
<< " WHERE vid = " << vid << " ORDER BY seq ASC";

return PoolSQL::dump(oss, "HISTORY_RECORDS", cmd);
}

/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */

VirtualMachineMonitorInfo VirtualMachinePool::get_monitoring(int vmid)
{
ostringstream cmd;
Expand Down

0 comments on commit f5416df

Please sign in to comment.