[Daemon] check active status along with enabled

The disabled/enabled option of systemctl only controls whether a daemon
should start at boot or not. But to ensure the daemon runs all the time,
we need to check the active status of the daemon as well.

To achieve this the daemon check function is updated to validate the active
status of the daemon along with disabled/enabled. Similarly, the daemon
repair function is also updated to activate/start the daemon if reported
inactive by check function.

Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>

Author: sourabhjains

servicereportpkg/check.py

@@ -56,14 +56,33 @@ def get_service(self):
 class DaemonCheck(Check):
     """Manage daemon check information"""
 
-    def __init__(self, name, daemon, status=None, note=None):
-        Check.__init__(self, name, status, note)
-        self.daemon = daemon
+    def __init__(self, name, status=None, enabled=None,
+                 active=None):
+        """Daemon check initializer"""
+
+        Check.__init__(self, name, status)
+        self.enabled = enabled
+        self.active = active
+
+    def set_daemon_enabled(self, enabled):
+        """Set daemon enabled status"""
+
+        self.enabled = enabled
+
+    def is_daemon_enabled(self):
+        """Returns daemon enabled status"""
+
+        return self.enabled
+
+    def set_daemon_active(self, active):
+        """Set daemon active status"""
+
+        self.active = active
 
-    def get_daemon(self):
-        """Returns the daemon name"""
+    def is_daemon_active(self):
+        """Returns daemon active status"""
 
-        return self.daemon
+        return self.active
 
 
 class PackageCheck(Check):

servicereportpkg/repair/plugins/daemon_repair.py

@@ -7,7 +7,7 @@
 
 
 from servicereportpkg.repair.plugins import RepairPlugin
-from servicereportpkg.utils import enable_daemon
+from servicereportpkg.utils import enable_daemon, restart_service
 from servicereportpkg.check import Notes
 
 class DaemonRepair(RepairPlugin):
@@ -22,8 +22,22 @@ def repair(self, plugin_obj, checks):
 
         for check in checks:
             if not check.get_status():
-                if enable_daemon(check.get_name()):
+                daemon = check.get_name()
+                enabled = check.is_daemon_enabled()
+                active = check.is_daemon_active()
+
+                if not enabled:
+                    enabled = enable_daemon(daemon)
+                    if enabled:
+                        check.set_daemon_enabled(True)
+
+                if not active:
+                    active = restart_service(daemon)
+                    if active:
+                        check.set_daemon_active(True)
+
+                if enabled and active:
                     check.set_status(True)
                     check.set_note(Notes.FIXED)
                 else:
-                    check.set_note(Notes.NOT_FIXABLE)
+                    check.set_note("Failed to enable/start %s" % daemon)

servicereportpkg/validate/plugins/daemon.py

@@ -8,6 +8,7 @@
 
 from servicereportpkg.check import DaemonCheck
 from servicereportpkg.utils import is_daemon_enabled
+from servicereportpkg.utils import get_service_status
 from servicereportpkg.validate.plugins import Plugin
 from servicereportpkg.validate.schemes.schemes import PSeriesScheme
 from servicereportpkg.validate.schemes.schemes import BMCPowerNVScheme
@@ -19,20 +20,33 @@
 
 
 def generate_daemon_check(self, daemon):
-    """Generates a function that checks the given daemon is enabled or not"""
+    """Generates a function to check daemon status"""
 
     def check():
-        check_daemon = daemon
-        daemon_status = is_daemon_enabled(check_daemon)
-
-        if daemon_status is None:
-            self.log.warning("Unable to find %s daemon status", check_daemon)
-        elif daemon_status is False:
-            self.log.error("%s is not enabled" % check_daemon)
+        status = True
+        enabled = is_daemon_enabled(daemon)
+
+        if enabled is None:
+            self.log.warning("Unable to find %s daemon status", daemon)
+        elif enabled is False:
+            self.log.error("%s is not enabled" % daemon)
+
+        active = get_service_status(daemon)
+        if active is None or active != 0:
+            self.log.error("%s daemon is not active", daemon)
+            self.log.recommendation("Start the service: systemctl start %s",
+                                    daemon)
+            active = False
         else:
-            self.log.info("%s is enabled" % check_daemon)
+            self.log.info("%s is active" % daemon)
+            active = True
+
+        if enabled is None or active is None:
+            status = None
+        elif enabled is False or active is False:
+            status = False
 
-        return DaemonCheck(check_daemon, check_daemon, daemon_status)
+        return DaemonCheck(daemon, status, enabled, active)
 
     check.__doc__ = "%s" % (daemon)
     return check