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

M #-: Test monitor_expiration time as <= (#1605)

Browse Source 
* Synchronize monitor_expiration semantics: <= 0 means monitoring
disabled
* VMRPCPool::get_monitoring minor optimization, no need to call SQL
querry if monitoring disabled

(cherry picked from commit e3a89e964e712fae15276fa7111339097faaa075)
This commit is contained in:
Pavel Czerný 2021-11-23 16:19:14 +01:00 committed by Ruben S. Montero
parent a73c2e229f
commit f167719c70
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/monitor/src/data_model/HostRPCPool.cc
View File

@ -66,7 +66,7 @@ int HostRPCPool::update_monitoring(const HostMonitoringTemplate& monitoring)
int HostRPCPool::clean_expired_monitoring()
{
if (monitor_expiration == 0)
if (monitor_expiration <= 0)
{
return 0;
}

7
src/monitor/src/data_model/VMRPCPool.cc
View File

@ -66,6 +66,11 @@ int VMRPCPool::update_monitoring(const VirtualMachineMonitorInfo& monitoring)
bool VMRPCPool::get_monitoring(int vmid, VirtualMachineMonitorInfo& vm)
{
if (monitor_expiration <= 0)
{
return false;
}
ostringstream cmd;
string monitor_str;
@ -126,7 +131,7 @@ int VMRPCPool::get_vmid(const string& deploy_id)
int VMRPCPool::clean_expired_monitoring()
{
if (monitor_expiration == 0)
if (monitor_expiration <= 0)
{
return 0;
}