From 330cf1463855cc8451a89605bd85bb29b233decd Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 9 Jul 2021 00:38:34 -0400
Subject: [PATCH] Remove return statements in keepalive collectors

These seem to bork the keepalive timer process, so just remove them and
let it continue to press on.
---
 node-daemon/pvcnoded/Daemon.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/node-daemon/pvcnoded/Daemon.py b/node-daemon/pvcnoded/Daemon.py
index 64be82cc..2f2ee0a1 100644
--- a/node-daemon/pvcnoded/Daemon.py
+++ b/node-daemon/pvcnoded/Daemon.py
@@ -1322,7 +1322,6 @@ def collect_ceph_stats(queue):
         ceph_health = json.loads(stdout)['status']
     except Exception as e:
         logger.out('Failed to obtain Ceph health data: {}'.format(e), state='e')
-        return
 
     if ceph_health == 'HEALTH_OK':
         ceph_health_colour = fmt_green
@@ -1343,7 +1342,6 @@ def collect_ceph_stats(queue):
             ])
         except Exception as e:
             logger.out('Failed to set Ceph status data: {}'.format(e), state='e')
-            return
 
         if debug:
             logger.out("Set ceph rados df information in zookeeper (primary only)", state='d', prefix='ceph-thread')
@@ -1356,7 +1354,6 @@ def collect_ceph_stats(queue):
             ])
         except Exception as e:
             logger.out('Failed to set Ceph utilization data: {}'.format(e), state='e')
-            return
 
         if debug:
             logger.out("Set pool information in zookeeper (primary only)", state='d', prefix='ceph-thread')
@@ -1589,7 +1586,6 @@ def collect_vm_stats(queue):
     lv_conn = libvirt.open(libvirt_name)
     if lv_conn is None:
         logger.out('Failed to open connection to "{}"'.format(libvirt_name), state='e')
-        return
 
     memalloc = 0
     memprov = 0
@@ -1849,7 +1845,6 @@ def node_keepalive():
         ])
     except Exception:
         logger.out('Failed to set keepalive data', state='e')
-        return
 
     # Display node information to the terminal
     if config['log_keepalives']: