Refactor filesystem identification logic and update resource defaults in HA configuration

Author: devanshjainms

src/modules/filesystem_freeze.py

@@ -97,6 +97,8 @@ def __init__(self, database_sid: str) -> None:
     def _find_filesystem(self) -> Tuple[str, str]:
         """
         Find the filesystem mounted on /hana/shared.
+        This method reads the /proc/mounts file to identify the filesystem.
+        It returns the filesystem device and the mount point as /hana/shared.
 
         :return: The filesystem mounted on /hana/shared.
         :rtype: Tuple[str, str]
@@ -105,8 +107,11 @@ def _find_filesystem(self) -> Tuple[str, str]:
             with open("/proc/mounts", "r", encoding="utf-8") as mounts_file:
                 for line in mounts_file:
                     parts = line.split()
-                    if len(parts) > 1 and parts[1] == "/hana/shared":
-                        return parts[0], parts[1]
+                    if len(parts) > 1 and parts[1] in [
+                        "/hana/shared",
+                        f"/hana/shared/{self.database_sid}",
+                    ]:
+                        return parts[0], "/hana/shared"
         except FileNotFoundError as ex:
             self.handle_error(ex)
         return None, None

src/roles/ha_db_hana/tasks/files/constants.yaml

@@ -152,30 +152,29 @@ RESOURCE_DEFAULTS:
         resource-stickiness:              "0"
 
   REDHAT:
-    stonith:
-      AFA:
-        instance_attributes:
-          pcmk_delay_max:                 "30s"
-          pcmk_monitor_retries:           "4"
-          pcmk_action_limit:              "3"
-          pcmk_reboot_timeout:            "900"
-          power_timeout:                  "240"
-          pcmk_monitor_timeout:           "120"
-        operations:
-          monitor:
-            interval:                     "3600"
-            timeout:                      "15"
-      ISCSI:
-        instance_attributes:
-          pcmk_monitor_retries:           "4"
-          pcmk_action_limit:              "3"
-          pcmk_reboot_timeout:            "900"
-          power_timeout:                  "240"
-          pcmk_monitor_timeout:           "120"
-        operations:
-          monitor:
-            interval:                     "600"
-            timeout:                      "15"
+    fence_agent:
+      instance_attributes:
+        pcmk_delay_max:                 "15"
+        pcmk_monitor_retries:           "4"
+        pcmk_action_limit:              "3"
+        pcmk_reboot_timeout:            "900"
+        power_timeout:                  "240"
+        pcmk_monitor_timeout:           "120"
+      operations:
+        monitor:
+          interval:                     "3600"
+
+    sbd_stonith:
+      instance_attributes:
+        pcmk_monitor_retries:           "4"
+        pcmk_action_limit:              "3"
+        pcmk_reboot_timeout:            "900"
+        power_timeout:                  "240"
+        pcmk_monitor_timeout:           "120"
+      operations:
+        monitor:
+          interval:                     "600"
+          timeout:                      "15"
 
     topology:
       meta_attributes: