shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Feature #1739: If the VM poll info can't be parsed, the VM is set to 'unknown'

Browse Source
This commit is contained in:
Carlos Martín 2013-02-18 14:30:35 +01:00
parent 69b4cfc083
commit 2fba9a4c5b
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/vmm/VirtualMachineManagerDriver.cc
View File

@ -470,10 +470,16 @@ void VirtualMachineManagerDriver::process_poll(
if (rc == -1)
{
vm->set_template_error_message("Error parsing monitoring information.");
oss << "Error parsing monitoring information: " << monitor_str;
NebulaLog::log("VMM", Log::ERROR, oss);
vm->set_template_error_message(oss.str());
vm->log("VMM", Log::ERROR, oss);
vmpool->update(vm);
lcm->trigger(LifeCycleManager::MONITOR_DONE, vm->get_oid());
return;
}
@ -546,7 +552,7 @@ int VirtualMachineManagerDriver::parse_vm_info(
{
istringstream is;
int parse_error = 0;
int parse_result = 0;
size_t pos;
string tmp;
@ -565,7 +571,7 @@ int VirtualMachineManagerDriver::parse_vm_info(
is.str(monitor_str);
while(is.good())
while(parse_result == 0 && is.good())
{
is >> tmp >> ws;
@ -573,7 +579,7 @@ int VirtualMachineManagerDriver::parse_vm_info(
if ( pos == string::npos )
{
parse_error = -1;
parse_result = -1;
continue;
}
@ -587,7 +593,7 @@ int VirtualMachineManagerDriver::parse_vm_info(
if (!tiss.good())
{
parse_error = -1;
parse_result = -1;
continue;
}
@ -619,9 +625,15 @@ int VirtualMachineManagerDriver::parse_vm_info(
custom.insert(make_pair(var, val));
}
if (!tiss.good())
{
parse_result = -1;
continue;
}
}
return parse_error;
return parse_result;
}
/* -------------------------------------------------------------------------- */