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

development: Solve issue when monitor only returns STATE data. Allow VM

Browse Source 
transitions from UNKNOWN on monitor messages. Move number of connections
messages to extra debug category
This commit is contained in:
Ruben S. Montero 2018-11-10 13:53:08 +01:00
parent 91133716a4
commit d6949cf260
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/host/Host.cc
View File

@ -384,7 +384,7 @@ int Host::update_info(Template &tmpl,
for(map_it = found.begin(); map_it != found.end(); )
{
if ( one_util::regex_match("STATE=. ",map_it->second.c_str()) != 0 )
if ( one_util::regex_match("STATE=.",map_it->second.c_str()) != 0 )
{
tmp_lost_vms->insert(map_it->first);
found.erase(map_it++);

2
src/rm/RequestManager.cc
View File

@ -202,7 +202,7 @@ extern "C" void * rm_xml_server_loop(void *arg)
oss << "Number of active connections: " << nc;
NebulaLog::log("ReM", Log::ERROR, oss);
NebulaLog::log("ReM", Log::DDEBUG, oss);
Connection * rc = new Connection(client_fd, cm);

4
src/vmm/VirtualMachineManagerDriver.cc
View File

@ -792,7 +792,8 @@ void VirtualMachineManagerDriver::process_poll(VirtualMachine* vm,
case 'e': //Failed
if ( vm->get_state() == VirtualMachine::ACTIVE &&
vm->get_lcm_state() == VirtualMachine::RUNNING )
( vm->get_lcm_state() == VirtualMachine::RUNNING ||
vm->get_lcm_state() == VirtualMachine::UNKNOWN ))
{
vm->log("VMM",Log::INFO,"VM running but monitor state is ERROR.");
@ -803,6 +804,7 @@ void VirtualMachineManagerDriver::process_poll(VirtualMachine* vm,
case 'd': //The VM was powered-off
if ( vm->get_state() == VirtualMachine::ACTIVE &&
( vm->get_lcm_state() == VirtualMachine::RUNNING ||
vm->get_lcm_state() == VirtualMachine::UNKNOWN ||
vm->get_lcm_state() == VirtualMachine::SHUTDOWN ||
vm->get_lcm_state() == VirtualMachine::SHUTDOWN_POWEROFF ||
vm->get_lcm_state() == VirtualMachine::SHUTDOWN_UNDEPLOY ))