Dev: Refactor

Author: liangxin1300

crmsh/sbd.py

@@ -559,7 +559,10 @@ def configure_sbd(self):
         Configure fence_sbd resource and related properties
         '''
         if self.diskless_sbd:
-            utils.set_property("stonith-watchdog-timeout", SBDTimeout.STONITH_WATCHDOG_TIMEOUT_DEFAULT)
+            if "stonith-watchdog" in self.timeout_dict:
+                utils.set_property("stonith-watchdog-timeout", self.timeout_dict.get("stonith-watchdog"), conditional=True)
+            else:
+                utils.set_property("stonith-watchdog-timeout", SBDTimeout.STONITH_WATCHDOG_TIMEOUT_DEFAULT)
         else:
             if utils.get_property("stonith-watchdog-timeout", get_default=False):
                 utils.delete_property("stonith-watchdog-timeout")

crmsh/ui_sbd.py

@@ -272,79 +272,53 @@ def _parse_args(self, args: tuple[str, ...]) -> dict[str, int|str]:
         logger.debug("Parsed arguments: %s", parameter_dict)
         return parameter_dict
 
-    @staticmethod
-    def _adjust_timeout_dict(timeout_dict: dict) -> dict:
-        watchdog_timeout = timeout_dict.get("watchdog")
-        msgwait_timeout = timeout_dict.get("msgwait")
-        if watchdog_timeout and msgwait_timeout and msgwait_timeout < 2*watchdog_timeout:
-            logger.warning("It's recommended to set msgwait timeout >= 2*watchdog timeout")
-            return timeout_dict
-        if watchdog_timeout and not msgwait_timeout:
-            timeout_dict["msgwait"] = 2*watchdog_timeout
-            logger.info("No msgwait timeout specified, use 2*watchdog timeout: %s", 2*watchdog_timeout)
-            return timeout_dict
-        if msgwait_timeout and not watchdog_timeout:
-            watchdog_timeout = msgwait_timeout//2
-            timeout_dict["watchdog"] = watchdog_timeout
-            logger.info("No watchdog timeout specified, use msgwait timeout/2: %s", watchdog_timeout)
-            return timeout_dict
-        return timeout_dict
-
-    def _configure_crashdump_watchdog(self, timeout: int) -> bool:
-        def set_crashdump_option() -> bool:
-            shell = sh.LocalShell()
-            cib = xmlutil.text2elem(shell.get_stdout_or_raise_error(None, 'crm configure show xml'))
-            ra = cibquery.ResourceAgent("stonith", "", "fence_sbd")
-            res_id_list = cibquery.has_primitive(cib, ra)
-            if not res_id_list:
-                logger.error("No fence_sbd resource found")
-                return False
-            crashdump_value = cibquery.get_parameter_value(cib, res_id_list[0], "crashdump")
-            if utils.is_boolean_false(crashdump_value):
-                cmd = f"crm resource param {res_id_list[0]} set crashdump 1"
-                shell.get_stdout_or_raise_error(None, cmd)
-            logger.info("Set crashdump option for fence_sbd resource")
-            return True
-
-        finished = True
-        logger.info("Configure crashdump watchdog timeout")
-
-        for node in self.cluster_nodes:
-            if not self.service_manager.service_is_active("kdump", node):
-                logger.error("kdump service is not active on %s", node)
-                return not finished
-
-        update_dict = {"SBD_TIMEOUT_ACTION": "flush,crashdump"}
-        if sbd.SBDUtils.is_using_disk_based_sbd():
-            if not set_crashdump_option():
-                return not finished
-            update_dict["SBD_OPTS"] = f"-C {timeout}"
-        elif sbd.SBDUtils.is_using_diskless_sbd():
-            update_dict["SBD_OPTS"] = f"-C {timeout} -Z"
-        sbd.SBDManager.update_sbd_configuration(update_dict)
-
-        return finished
+    def set_crashdump_option(self):
+        '''
+        Set crashdump option for fence_sbd resource
+        '''
+        shell = sh.LocalShell()
+        cib = xmlutil.text2elem(shell.get_stdout_or_raise_error(None, 'crm configure show xml'))
+        ra = cibquery.ResourceAgent("stonith", "", "fence_sbd")
+        res_id_list = cibquery.has_primitive(cib, ra)
+        if not res_id_list:
+            logger.error("No fence_sbd resource found")
+            return
+        crashdump_value = cibquery.get_parameter_value(cib, res_id_list[0], "crashdump")
+        if utils.is_boolean_false(crashdump_value):
+            cmd = f"crm resource param {res_id_list[0]} set crashdump 1"
+            shell.get_stdout_or_raise_error(None, cmd)
+        logger.info("Set crashdump option for fence_sbd resource")
 
     def _configure_diskbase(self, parameter_dict: dict):
         '''
         Configure disk-based SBD based on input parameters and runtime config
         '''
         update_dict = {}
+        timeout_dict = {
+            item: parameter_dict.get(item) or self.device_meta_dict_runtime.get(item)
+            for item in self.TIMEOUT_TYPES if item != "crashdump-watchdog"
+        }
+
+        crashdump_watchdog_timeout = parameter_dict.get("crashdump-watchdog")
+        if crashdump_watchdog_timeout:
+            self.set_crashdump_option()
+            timeout_dict["msgwait"] = 2*timeout_dict["watchdog"] + crashdump_watchdog_timeout
+            logger.info("Set msgwait timeout to 2*watchdog + crashdump-watchdog: %s", timeout_dict["msgwait"])
+            update_dict["SBD_TIMEOUT_ACTION"] = "flush,crashdump"
+            update_dict["SBD_OPTS"] = f"-C {crashdump_watchdog_timeout}"
+
+        if timeout_dict["msgwait"] < 2*timeout_dict["watchdog"]:
+            logger.warning("It's recommended to set msgwait timeout >= 2*watchdog timeout")
+            return
+
         watchdog_device = parameter_dict.get("watchdog-device")
         if watchdog_device != self.watchdog_device_from_config:
             update_dict["SBD_WATCHDOG_DEV"] = watchdog_device
-        timeout_dict = {k: v for k, v in parameter_dict.items() if k in self.TIMEOUT_TYPES}
-        is_subdict_timeout = utils.is_subdict(timeout_dict, self.device_meta_dict_runtime)
 
-        if is_subdict_timeout and not update_dict:
-            logger.info("No metadata of SBD device changed")
+        if timeout_dict == self.device_meta_dict_runtime and not update_dict:
+            logger.info("No change in SBD configuration")
             return
 
-        if not is_subdict_timeout:
-            timeout_dict = self._adjust_timeout_dict(timeout_dict)
-            # merge runtime timeout dict into parameter timeout dict without overwriting
-            timeout_dict = {**self.device_meta_dict_runtime, **timeout_dict}
-
         sbd_manager = sbd.SBDManager(
             device_list_to_init=self.device_list_from_config,
             timeout_dict=timeout_dict,
@@ -357,17 +331,27 @@ def _configure_diskless(self, parameter_dict: dict):
         Configure diskless SBD based on input parameters and runtime config
         '''
         update_dict = {}
+        timeout_dict = {}
         watchdog_timeout = parameter_dict.get("watchdog")
         if watchdog_timeout and watchdog_timeout != self.watchdog_timeout_from_config:
             update_dict["SBD_WATCHDOG_TIMEOUT"] = str(watchdog_timeout)
         watchdog_device = parameter_dict.get("watchdog-device")
         if watchdog_device != self.watchdog_device_from_config:
             update_dict["SBD_WATCHDOG_DEV"] = watchdog_device
+        crashdump_watchdog_timeout = parameter_dict.get("crashdump-watchdog")
+        if crashdump_watchdog_timeout:
+            update_dict["SBD_TIMEOUT_ACTION"] = "flush,crashdump"
+            update_dict["SBD_OPTS"] = f"-C {crashdump_watchdog_timeout} -Z"
+            sbd_watchdog_timeout = watchdog_timeout or self.watchdog_timeout_from_config
+            stonith_watchdog_timeout = sbd_watchdog_timeout + crashdump_watchdog_timeout
+            logger.info("Set stonith-watchdog-timeout to SBD_WATCHDOG_TIMEOUT + crashdump-watchdog: %s", stonith_watchdog_timeout)
+            timeout_dict["stonith-watchdog"] = stonith_watchdog_timeout
         if not update_dict:
             logger.info("No change in SBD configuration")
             return
 
         sbd_manager = sbd.SBDManager(
+            timeout_dict=timeout_dict,
             update_dict=update_dict,
             diskless_sbd=True
         )
@@ -465,14 +449,10 @@ def do_configure(self, context, *args) -> bool:
                 return True
 
             parameter_dict = self._parse_args(args)
-            crashdump_watchdog_timeout = parameter_dict.pop("crashdump-watchdog", None)
             if sbd.SBDUtils.is_using_disk_based_sbd():
                 self._configure_diskbase(parameter_dict)
             elif sbd.SBDUtils.is_using_diskless_sbd():
                 self._configure_diskless(parameter_dict)
-            if crashdump_watchdog_timeout:
-                if not self._configure_crashdump_watchdog(crashdump_watchdog_timeout):
-                    return False
             return True
 
         except self.SyntaxError as e:

crmsh/utils.py

@@ -3202,11 +3202,4 @@ def strip_ansi_escape_sequences(text):
     """
     ansi_escape_pattern = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
     return ansi_escape_pattern.sub('', text)
-
-
-def is_subdict(sub_dict, main_dict):
-    """
-    Check if sub_dict is a sub-dictionary of main_dict
-    """
-    return all(main_dict.get(k) == v for k, v in sub_dict.items())
 # vim:ts=4:sw=4:et: