More fencer refactors (mostly related to flags)

daemons/controld/controld_fencing.c

@@ -661,7 +661,7 @@ controld_timer_fencer_connect(gpointer user_data)
     int rc = pcmk_ok;
 
     if (stonith_api == NULL) {
-        stonith_api = stonith_api_new();
+        stonith_api = stonith__api_new();
         if (stonith_api == NULL) {
             crm_err("Could not connect to fencer: API memory allocation failed");
             return G_SOURCE_REMOVE;
@@ -675,10 +675,10 @@ controld_timer_fencer_connect(gpointer user_data)
 
     if (user_data == NULL) {
         // Blocking (retry failures now until successful)
-        rc = stonith_api_connect_retry(stonith_api, crm_system_name, 30);
-        if (rc != pcmk_ok) {
+        rc = stonith__api_connect_retry(stonith_api, crm_system_name, 30);
+        if (rc != pcmk_rc_ok) {
             crm_err("Could not connect to fencer in 30 attempts: %s "
-                    QB_XS " rc=%d", pcmk_strerror(rc), rc);
+                    QB_XS " rc=%d", pcmk_rc_str(rc), rc);
         }
     } else {
         // Non-blocking (retry failures later in main loop)
@@ -766,7 +766,7 @@ do_stonith_history_sync(gpointer user_data)
         stonith_api->cmds->history(stonith_api,
                                    st_opt_sync_call | st_opt_broadcast,
                                    NULL, &history, 5);
-        stonith_history_free(history);
+        stonith__history_free(history);
         return TRUE;
     } else {
         crm_info("Skip triggering stonith history-sync as stonith is disconnected");

daemons/execd/execd_commands.c

@@ -1212,7 +1212,7 @@ execd_stonith_start(stonith_t *stonith_api, const lrmd_rsc_t *rsc,
 
         g_hash_table_iter_init(&iter, cmd->params);
         while (g_hash_table_iter_next(&iter, (gpointer *) & key, (gpointer *) & value)) {
-            device_params = stonith_key_value_add(device_params, key, value);
+            device_params = stonith__key_value_add(device_params, key, value);
         }
     }
 
@@ -1226,7 +1226,7 @@ execd_stonith_start(stonith_t *stonith_api, const lrmd_rsc_t *rsc,
                                             cmd->rsc_id, rsc->provider,
                                             rsc->type, device_params);
 
-    stonith_key_value_freeall(device_params, 1, 1);
+    stonith__key_value_freeall(device_params, true, true);
     return rc;
 }
 
@@ -1283,9 +1283,11 @@ execd_stonith_monitor(stonith_t *stonith_api, lrmd_rsc_t *rsc, lrmd_cmd_t *cmd)
 static void
 execute_stonith_action(lrmd_rsc_t *rsc, lrmd_cmd_t *cmd)
 {
-    int rc = 0;
-    bool do_monitor = FALSE;
+    int rc = pcmk_ok;
+    const char *rc_s = NULL;
+    bool do_monitor = false;
 
+    // Don't free; belongs to pacemaker-execd.c
     stonith_t *stonith_api = get_stonith_connection();
 
     if (pcmk__str_eq(cmd->action, PCMK_ACTION_MONITOR, pcmk__str_casei)
@@ -1295,25 +1297,27 @@ execute_stonith_action(lrmd_rsc_t *rsc, lrmd_cmd_t *cmd)
                                 rsc->fence_probe_result.execution_status,
                                 rsc->fence_probe_result.exit_reason);
         return;
+    }
 
-    } else if (stonith_api == NULL) {
+    if (stonith_api == NULL) {
         stonith_action_complete(cmd, PCMK_OCF_UNKNOWN_ERROR,
                                 PCMK_EXEC_NOT_CONNECTED,
                                 "No connection to fencer");
         return;
+    }
 
-    } else if (pcmk__str_eq(cmd->action, PCMK_ACTION_START, pcmk__str_casei)) {
+    if (pcmk__str_eq(cmd->action, PCMK_ACTION_START, pcmk__str_casei)) {
         rc = execd_stonith_start(stonith_api, rsc, cmd);
         if (rc == pcmk_ok) {
-            do_monitor = TRUE;
+            do_monitor = true;
         }
 
     } else if (pcmk__str_eq(cmd->action, PCMK_ACTION_STOP, pcmk__str_casei)) {
         rc = execd_stonith_stop(stonith_api, rsc);
 
     } else if (pcmk__str_eq(cmd->action, PCMK_ACTION_MONITOR,
                             pcmk__str_casei)) {
-        do_monitor = TRUE;
+        do_monitor = true;
 
     } else {
         stonith_action_complete(cmd, PCMK_OCF_UNIMPLEMENT_FEATURE,
@@ -1325,15 +1329,17 @@ execute_stonith_action(lrmd_rsc_t *rsc, lrmd_cmd_t *cmd)
     if (do_monitor) {
         rc = execd_stonith_monitor(stonith_api, rsc, cmd);
         if (rc == pcmk_ok) {
-            // Don't clean up yet, we will find out result of the monitor later
+            // Don't clean up yet. We will get the result of the monitor later.
             return;
         }
     }
 
+    if (rc != -pcmk_err_generic) {
+        rc_s = pcmk_strerror(rc);
+    }
     stonith_action_complete(cmd,
-                            ((rc == pcmk_ok)? CRM_EX_OK : CRM_EX_ERROR),
-                            stonith__legacy2status(rc),
-                            ((rc == -pcmk_err_generic)? NULL : pcmk_strerror(rc)));
+                            ((rc == pcmk_rc_ok)? CRM_EX_OK : CRM_EX_ERROR),
+                            stonith__legacy2status(rc), rc_s);
 }
 
 static void

daemons/execd/pacemaker-execd.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the Pacemaker project contributors
+ * Copyright 2012-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -22,6 +22,7 @@
 #include <crm/common/mainloop.h>
 #include <crm/common/output_internal.h>
 #include <crm/common/remote_internal.h>
+#include <crm/fencing/internal.h>           // stonith__api_new()
 #include <crm/lrmd_internal.h>
 
 #include "pacemaker-execd.h"
@@ -67,23 +68,23 @@ stonith_t *
 get_stonith_connection(void)
 {
     if (stonith_api && stonith_api->state == stonith_disconnected) {
-        stonith_api_delete(stonith_api);
+        stonith__api_free(stonith_api);
         stonith_api = NULL;
     }
 
     if (stonith_api == NULL) {
         int rc = pcmk_ok;
 
-        stonith_api = stonith_api_new();
+        stonith_api = stonith__api_new();
         if (stonith_api == NULL) {
             crm_err("Could not connect to fencer: API memory allocation failed");
             return NULL;
         }
-        rc = stonith_api_connect_retry(stonith_api, crm_system_name, 10);
-        if (rc != pcmk_ok) {
+        rc = stonith__api_connect_retry(stonith_api, crm_system_name, 10);
+        if (rc != pcmk_rc_ok) {
             crm_err("Could not connect to fencer in 10 attempts: %s "
-                    QB_XS " rc=%d", pcmk_strerror(rc), rc);
-            stonith_api_delete(stonith_api);
+                    QB_XS " rc=%d", pcmk_rc_str(rc), rc);
+            stonith__api_free(stonith_api);
             stonith_api = NULL;
         } else {
             stonith_api_operations_t *cmds = stonith_api->cmds;
@@ -283,7 +284,7 @@ exit_executor(void)
 
     crm_info("Terminating with %d client%s",
              nclients, pcmk__plural_s(nclients));
-    stonith_api_delete(stonith_api);
+    stonith__api_free(stonith_api);
     if (ipcs) {
         mainloop_del_ipc_server(ipcs);
     }