From 54d60c4223c5da72535f37733c0747b853d4618b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Czern=C3=BD?= Date: Mon, 11 May 2020 10:35:13 +0200 Subject: [PATCH] F #3859: Small fixes in monitoring (#4686) --- src/host/HostShareNUMA.cc | 4 ++++ src/im/InformationManager.cc | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/host/HostShareNUMA.cc b/src/host/HostShareNUMA.cc index 010406f473..07bde1a1c4 100644 --- a/src/host/HostShareNUMA.cc +++ b/src/host/HostShareNUMA.cc @@ -847,6 +847,10 @@ void HostShareNUMA::set_monitorization(Template &ht, unsigned int _vt) node.set_memory(); } + + ht.erase("CORE"); + ht.erase("HUGEPAGE"); + ht.erase("MEMORY_NODE"); } // ----------------------------------------------------------------------------- diff --git a/src/im/InformationManager.cc b/src/im/InformationManager.cc index 67e3c8876b..f8e64261c7 100644 --- a/src/im/InformationManager.cc +++ b/src/im/InformationManager.cc @@ -531,11 +531,11 @@ void InformationManager::_vm_state(unique_ptr> msg) LCMAction::Actions action; - if ( state_str == "POWEROFF" ) + if ( missing_state == "POWEROFF" ) { action = LCMAction::MONITOR_POWEROFF; } - else if ( state_str == "UNKNOWN" ) + else if ( missing_state == "UNKNOWN" ) { action = LCMAction::MONITOR_DONE; } @@ -546,7 +546,7 @@ void InformationManager::_vm_state(unique_ptr> msg) NebulaLog::debug("InM", "VM_STATE update from host: " + to_string(msg->oid()) + ". VM id: " + to_string(vm->get_oid()) + - ", state: " + state_str); + ", state: " + missing_state); lcm->trigger(action, vm->get_oid());