Dev: sbd: Use SBDUtils.get_sbd_device_from_config for reliable diskless SBD detection (#1887)

The configure_sbd function may be invoked during the bootstrap `cluster`
stage without the -S option. Switching to
SBDUtils.get_sbd_device_from_config provides a more reliable way to
determine if SBD is diskless.

Author: liangxin1300

crmsh/sbd.py

@@ -577,15 +577,15 @@ def configure_sbd(self):
         '''
         Configure fence_sbd resource and related properties
         '''
-        if self.diskless_sbd:
-            swt_value = self.timeout_dict.get("stonith-watchdog", SBDTimeout.get_stonith_watchdog_timeout_expected())
-            utils.set_property("stonith-watchdog-timeout", swt_value)
-        else:
+        if SBDUtils.get_sbd_device_from_config():
             if utils.get_property("stonith-watchdog-timeout", get_default=False):
                 utils.delete_property("stonith-watchdog-timeout")
             if not xmlutil.CrmMonXmlParser().is_resource_configured(self.SBD_RA):
                 cmd = f"crm configure primitive {self.SBD_RA_ID} {self.SBD_RA}"
                 sh.cluster_shell().get_stdout_or_raise_error(cmd)
+        else:
+            swt_value = self.timeout_dict.get("stonith-watchdog", SBDTimeout.get_stonith_watchdog_timeout_expected())
+            utils.set_property("stonith-watchdog-timeout", swt_value)
         utils.set_property("stonith-enabled", "true")
 
     def _warn_diskless_sbd(self, peer=None):

test/features/bootstrap_sbd_normal.feature

@@ -128,6 +128,21 @@ Feature: crmsh bootstrap sbd management
     And     Service "sbd" is "started" on "hanode2"
     And     Resource "stonith-sbd" type "fence_sbd" is "Started"
 
+  @clean
+  Scenario: Configure diskless sbd on running cluster via stage
+    Given   Cluster service is "stopped" on "hanode1"
+    Given   Cluster service is "stopped" on "hanode2"
+    When    Run "crm cluster init -y" on "hanode1"
+    Then    Cluster service is "started" on "hanode1"
+    When    Run "crm cluster join -c hanode1 -y" on "hanode2"
+    Then    Cluster service is "started" on "hanode2"
+    And     Online nodes are "hanode1 hanode2"
+    When    Run "crm cluster init sbd -S -y" on "hanode1"
+    Then    Expected "Diskless SBD requires cluster with three or more nodes." in stderr
+    Then    Service "sbd" is "started" on "hanode1"
+    And     Service "sbd" is "started" on "hanode2"
+    And     Resource "stonith:fence_sbd" not configured
+
   @clean
   Scenario: Configure sbd on running cluster via stage with ra running(bsc#1181906)
     Given   Cluster service is "stopped" on "hanode1"

test/unittests/test_sbd.py

@@ -755,9 +755,11 @@ def test_initialize_sbd_return(self, mock_convert_timeout_dict_to_opt_str):
     @patch('crmsh.utils.set_property')
     @patch('crmsh.sbd.ServiceManager')
     @patch('crmsh.sbd.SBDTimeout.get_stonith_watchdog_timeout_expected')
-    def test_configure_sbd_diskless(self, mock_get_stonith_watchdog_timeout, mock_ServiceManager, mock_set_property):
+    @patch('crmsh.sbd.SBDUtils.get_sbd_device_from_config')
+    def test_configure_sbd_diskless(self, mock_get_sbd_device, mock_get_stonith_watchdog_timeout, mock_ServiceManager, mock_set_property):
         mock_get_stonith_watchdog_timeout.return_value = 2
-        sbdmanager_instance = SBDManager(diskless_sbd=True)
+        mock_get_sbd_device.return_value = False
+        sbdmanager_instance = SBDManager()
         sbdmanager_instance.configure_sbd()
         mock_set_property.assert_has_calls([
             call("stonith-watchdog-timeout", 2),
@@ -770,7 +772,9 @@ def test_configure_sbd_diskless(self, mock_get_stonith_watchdog_timeout, mock_Se
     @patch('crmsh.sbd.xmlutil.CrmMonXmlParser')
     @patch('crmsh.utils.set_property')
     @patch('crmsh.sbd.ServiceManager')
-    def test_configure_sbd(self, mock_ServiceManager, mock_set_property, mock_CrmMonXmlParser, mock_cluster_shell, mock_get_property, mock_delete_property):
+    @patch('crmsh.sbd.SBDUtils.get_sbd_device_from_config')
+    def test_configure_sbd(self, mock_get_sbd_device, mock_ServiceManager, mock_set_property, mock_CrmMonXmlParser, mock_cluster_shell, mock_get_property, mock_delete_property):
+        mock_get_sbd_device.return_value = True
         mock_get_property.return_value = -1
         mock_CrmMonXmlParser.return_value.is_resource_configured.return_value = False
         mock_cluster_shell.return_value.get_stdout_or_raise_error.return_value = "data"