Merge branch 'fencing-watchdog-timeout'

Author: tomjelinek

pcs/common/reports/messages.py

@@ -4784,7 +4784,8 @@ class StonithWatchdogTimeoutCannotBeSet(ReportItemMessage):
     @property
     def message(self) -> str:
         return (
-            "stonith-watchdog-timeout can only be unset or set to 0 while "
+            "fencing-watchdog-timeout / stonith-watchdog-timeout can only be "
+            "unset or set to 0 while "
             + _stonith_watchdog_timeout_reason_to_str(self.reason)
         )
 
@@ -4801,7 +4802,8 @@ class StonithWatchdogTimeoutCannotBeUnset(ReportItemMessage):
     @property
     def message(self) -> str:
         return (
-            "stonith-watchdog-timeout cannot be unset or set to 0 while "
+            "fencing-watchdog-timeout / stonith-watchdog-timeout cannot be "
+            "unset or set to 0 while "
             + _stonith_watchdog_timeout_reason_to_str(self.reason)
         )
 
@@ -4822,7 +4824,8 @@ class StonithWatchdogTimeoutTooSmall(ReportItemMessage):
     @property
     def message(self) -> str:
         return (
-            "The stonith-watchdog-timeout must be greater than SBD watchdog "
+            "The fencing-watchdog-timeout / stonith-watchdog-timeout must be "
+            "greater than SBD watchdog "
             f"timeout '{self.cluster_sbd_watchdog_timeout}', entered "
             f"'{self.entered_watchdog_timeout}'"
         )

pcs/lib/cluster_property.py

@@ -1,19 +1,12 @@
-from typing import (
-    Iterable,
-    List,
-    Mapping,
-)
+from typing import Mapping
 
 from lxml.etree import _Element
 
 from pcs.common import reports
 from pcs.common.services.interfaces import ServiceManagerInterface
 from pcs.common.tools import timeout_to_seconds
 from pcs.common.types import StringSequence
-from pcs.lib import (
-    sbd,
-    validate,
-)
+from pcs.lib import sbd, validate
 from pcs.lib.cib import nvpair_multi
 from pcs.lib.cib.tools import (
     IdProvider,
@@ -23,7 +16,7 @@
 from pcs.lib.errors import LibraryError
 from pcs.lib.external import CommandRunner
 from pcs.lib.pacemaker.values import is_false
-from pcs.lib.resource_agent import ResourceAgentParameter
+from pcs.lib.resource_agent import ResourceAgentFacade
 
 READONLY_CLUSTER_PROPERTY_LIST = [
     "cluster-infrastructure",
@@ -33,6 +26,10 @@
     "last-lrm-refresh",
 ]
 _DEFAULT_CLUSTER_PROPERTY_SET_ID = "cib-bootstrap-options"
+_STONITH_WATCHDOG_TIMEOUT_PROPERTIES = [
+    "stonith-watchdog-timeout",
+    "fencing-watchdog-timeout",
+]
 
 
 def _validate_stonith_watchdog_timeout_property(
@@ -69,7 +66,7 @@ def _validate_stonith_watchdog_timeout_property(
 
 def _validate_not_disabling_fencing(
     to_be_set_properties: Mapping[str, str],
-) -> List[reports.ReportItem]:
+) -> reports.ReportItemList:
     problematic_properties_setting = {
         key: to_be_set_properties[key]
         for key in ["stonith-enabled", "fencing-enabled"]
@@ -90,7 +87,7 @@ def _validate_not_disabling_fencing(
 
 def validate_set_cluster_properties(  # noqa: PLR0912
     runner: CommandRunner,
-    params_spec: Iterable[ResourceAgentParameter],
+    cluster_properties_facade: ResourceAgentFacade,
     properties_set_id: str,
     configured_properties: StringSequence,
     new_properties: Mapping[str, str],
@@ -100,7 +97,7 @@ def validate_set_cluster_properties(  # noqa: PLR0912
     """
     Validate that cluster properties and their values can be set.
 
-    params_spec -- params specified by agent "cluster-options"
+    cluster_properties_facade -- facade for cluster properties metadata
     properties_set_id -- id of the properties set to be updated
     configured_properties -- names of currently configured cluster properties
     new_properties -- dictionary of properties and their values to be set
@@ -111,7 +108,7 @@ def validate_set_cluster_properties(  # noqa: PLR0912
     # pylint: disable=too-many-locals
     possible_properties_dict = {
         parameter.name: parameter
-        for parameter in params_spec
+        for parameter in cluster_properties_facade.metadata.parameters
         if parameter.name not in READONLY_CLUSTER_PROPERTY_LIST
     }
     severity = reports.get_severity(reports.codes.FORCE, force)
@@ -124,33 +121,37 @@ def validate_set_cluster_properties(  # noqa: PLR0912
         else:
             to_be_removed_properties.append(name)
 
-    report_list = validate.validate_set_unset_items(
-        to_be_set_properties.keys(),
-        to_be_removed_properties,
-        configured_properties,
-        reports.const.ADD_REMOVE_CONTAINER_TYPE_PROPERTY_SET,
-        reports.const.ADD_REMOVE_ITEM_TYPE_PROPERTY,
-        properties_set_id,
-        severity=severity,
-    )
+    report_list = []
 
     report_list.extend(
-        validate.NamesIn(
-            possible_properties_dict.keys(),
-            option_type="cluster property",
-            banned_name_list=READONLY_CLUSTER_PROPERTY_LIST,
+        validate.ValidatorAll(
+            cluster_properties_facade.get_validators_deprecated_parameters()
+        ).validate(new_properties)
+    )
+    report_list.extend(
+        validate.validate_set_unset_items(
+            to_be_set_properties.keys(),
+            to_be_removed_properties,
+            configured_properties,
+            reports.const.ADD_REMOVE_CONTAINER_TYPE_PROPERTY_SET,
+            reports.const.ADD_REMOVE_ITEM_TYPE_PROPERTY,
+            properties_set_id,
             severity=severity,
+        )
+    )
+    report_list.extend(
+        validate.ValidatorAll(
+            cluster_properties_facade.get_validators_allowed_parameters(
+                force=force,
+                banned_parameter_list=READONLY_CLUSTER_PROPERTY_LIST,
+            )
         ).validate(
             # Allow removing properties unknown to pacemaker while preventing
             # setting them. Prevent removing read-only properties.
             {
                 name: value
                 for name, value in new_properties.items()
-                if not (
-                    value == ""
-                    and name not in READONLY_CLUSTER_PROPERTY_LIST
-                    and name not in possible_properties_dict
-                )
+                if value != "" or name in READONLY_CLUSTER_PROPERTY_LIST
             }
         )
     )
@@ -213,7 +214,7 @@ def validate_set_cluster_properties(  # noqa: PLR0912
             )
         elif property_metadata.type in ["time", "timeout"]:
             # make stonith-watchdog-timeout value not forcable
-            if property_metadata.name == "stonith-watchdog-timeout":
+            if property_metadata.name in _STONITH_WATCHDOG_TIMEOUT_PROPERTIES:
                 validators.append(
                     validate.ValueTimeInterval(
                         property_metadata.name,
@@ -239,17 +240,17 @@ def validate_set_cluster_properties(  # noqa: PLR0912
 
     # Only validate SWT if it is being set, or if it is being removed and it
     # actually exists in the current configuration.
-    if "stonith-watchdog-timeout" in new_properties and (
-        new_properties["stonith-watchdog-timeout"]
-        or "stonith-watchdog-timeout" in configured_properties
-    ):
-        report_list.extend(
-            _validate_stonith_watchdog_timeout_property(
-                service_manager,
-                new_properties["stonith-watchdog-timeout"],
-                force=force,
+    for prop_name in _STONITH_WATCHDOG_TIMEOUT_PROPERTIES:
+        if prop_name in new_properties and (
+            new_properties[prop_name] or prop_name in configured_properties
+        ):
+            report_list.extend(
+                _validate_stonith_watchdog_timeout_property(
+                    service_manager,
+                    new_properties[prop_name],
+                    force=force,
+                )
             )
-        )
 
     report_list.extend(_validate_not_disabling_fencing(to_be_set_properties))
 

pcs/lib/commands/cluster_property.py

@@ -7,15 +7,9 @@
 from pcs.common.str_tools import join_multilines
 from pcs.common.types import StringSequence
 from pcs.lib import cluster_property
-from pcs.lib.cib import (
-    nvpair_multi,
-    rule,
-)
+from pcs.lib.cib import nvpair_multi, rule
 from pcs.lib.cib.rule.in_effect import get_rule_evaluator
-from pcs.lib.cib.tools import (
-    IdProvider,
-    get_crm_config,
-)
+from pcs.lib.cib.tools import IdProvider, get_crm_config
 from pcs.lib.env import LibraryEnvironment
 from pcs.lib.errors import LibraryError
 from pcs.lib.external import CommandRunner
@@ -26,17 +20,18 @@
 )
 from pcs.lib.resource_agent import (
     ResourceAgentError,
+    ResourceAgentFacade,
+    ResourceAgentFacadeFactory,
     ResourceAgentMetadata,
     resource_agent_error_to_report_item,
 )
 from pcs.lib.resource_agent import const as ra_const
-from pcs.lib.resource_agent.facade import ResourceAgentFacadeFactory
 
 
-def _get_properties_metadata(
+def _get_properties_facade(
     report_processor: reports.ReportProcessor,
     runner: CommandRunner,
-) -> ResourceAgentMetadata:
+) -> ResourceAgentFacade:
     if not is_crm_attribute_list_options_supported(runner):
         report_processor.report(
             reports.ReportItem.error(
@@ -47,9 +42,7 @@ def _get_properties_metadata(
 
     try:
         factory = ResourceAgentFacadeFactory(runner, report_processor)
-        return factory.facade_from_crm_attribute(
-            ra_const.CLUSTER_OPTIONS
-        ).metadata
+        return factory.facade_from_crm_attribute(ra_const.CLUSTER_OPTIONS)
     except ResourceAgentError as e:
         report_processor.report_list(
             [
@@ -113,7 +106,7 @@ def get_cluster_properties_definition_legacy(
     env -- provides communication with externals
     """
     return _cluster_property_metadata_to_dict(
-        _get_properties_metadata(env.report_processor, env.cmd_runner())
+        _get_properties_facade(env.report_processor, env.cmd_runner()).metadata
     )
 
 
@@ -151,7 +144,7 @@ def set_properties(
     env.report_processor.report_list(
         cluster_property.validate_set_cluster_properties(
             runner,
-            _get_properties_metadata(env.report_processor, runner).parameters,
+            _get_properties_facade(env.report_processor, runner),
             set_id,
             configured_properties,
             cluster_properties,
@@ -206,11 +199,11 @@ def get_properties_metadata(
 
     env -- provides communication with externals
     """
-    metadata = _get_properties_metadata(env.report_processor, env.cmd_runner())
+    facade = _get_properties_facade(env.report_processor, env.cmd_runner())
     return ClusterPropertyMetadataDto(
         properties_metadata=[
             property_definition.to_dto()
-            for property_definition in metadata.parameters
+            for property_definition in facade.metadata.parameters
         ],
         readonly_properties=cluster_property.READONLY_CLUSTER_PROPERTY_LIST,
     )