Merge pull request #2902 from nrwahl2/nrwahl2-clbz#5501

Fix: libpacemaker: crm_mon --one-shot can fail during pacemaker shutdown
ClusterLabs · Oct 12, 2022 · 44db4ca · 44db4ca
2 parents 06102ab + a165cdf
commit 44db4ca
Show file tree

Hide file tree

Showing 15 changed files with 640 additions and 177 deletions.
diff --git a/include/crm/common/ipc_internal.h b/include/crm/common/ipc_internal.h
@@ -29,6 +29,7 @@ extern "C" {
 
 #include <crm_config.h>             // HAVE_GETPEEREID
 #include <crm/common/ipc.h>
+#include <crm/common/ipc_pacemakerd.h>  // enum pcmk_pacemakerd_state
 #include <crm/common/mainloop.h>    // mainloop_io_t
 
 /*
@@ -278,6 +279,8 @@ pcmk__ipc_sys_name(const char *ipc_name, const char *fallback)
     return ipc_name ? ipc_name : ((crm_system_name ? crm_system_name : fallback));
 }
 
+const char *pcmk__pcmkd_state_enum2friendly(enum pcmk_pacemakerd_state state);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/crm/common/output_internal.h b/include/crm/common/output_internal.h
@@ -28,7 +28,7 @@ extern "C" {
  */
 
 
-#  define PCMK__API_VERSION "2.24"
+#  define PCMK__API_VERSION "2.25"
 
 #if defined(PCMK__WITH_ATTRIBUTE_OUTPUT_ARGS)
 #  define PCMK__OUTPUT_ARGS(ARGS...) __attribute__((output_args(ARGS)))

diff --git a/include/pacemaker.h b/include/pacemaker.h
@@ -107,15 +107,22 @@ int pcmk_designated_controller(xmlNodePtr *xml, unsigned int message_timeout_ms)
 void pcmk_free_injections(pcmk_injections_t *injections);
 
 /*!
- * \brief Get pacemakerd status
- *
- * \param[in,out] xml                The destination for the result, as an XML tree.
- * \param[in]     ipc_name           IPC name for request
- * \param[in]     message_timeout_ms Message timeout
+ * \brief Get and output \p pacemakerd status
+ *
+ * \param[in,out] xml                 Destination for the result, as an XML tree
+ * \param[in]     ipc_name            IPC name for request
+ * \param[in]     message_timeout_ms  How long to wait for a reply from the
+ *                                    \p pacemakerd API. If 0,
+ *                                    \p pcmk_ipc_dispatch_sync will be used.
+ *                                    If positive, \p pcmk_ipc_dispatch_main
+ *                                    will be used, and a new mainloop will be
+ *                                    created for this purpose (freed before
+ *                                    return).
  *
  * \return Standard Pacemaker return code
  */
-int pcmk_pacemakerd_status(xmlNodePtr *xml, char *ipc_name, unsigned int message_timeout_ms);
+int pcmk_pacemakerd_status(xmlNodePtr *xml, const char *ipc_name,
+                           unsigned int message_timeout_ms);
 
 /*!
  * \brief Calculate and output resource operation digests

diff --git a/include/pcmki/pcmki_cluster_queries.h b/include/pcmki/pcmki_cluster_queries.h
@@ -19,7 +19,9 @@
 
 int pcmk__controller_status(pcmk__output_t *out, char *dest_node, guint message_timeout_ms);
 int pcmk__designated_controller(pcmk__output_t *out, guint message_timeout_ms);
-int pcmk__pacemakerd_status(pcmk__output_t *out, char *ipc_name, guint message_timeout_ms);
+int pcmk__pacemakerd_status(pcmk__output_t *out, const char *ipc_name,
+                            guint message_timeout_ms,
+                            enum pcmk_pacemakerd_state *state);
 int pcmk__list_nodes(pcmk__output_t *out, char *node_types, gboolean bash_export);
 
 #endif
diff --git a/include/pcmki/pcmki_status.h b/include/pcmki/pcmki_status.h
@@ -38,15 +38,19 @@ extern "C" {
  */
 int pcmk__output_simple_status(pcmk__output_t *out, pe_working_set_t *data_set);
 
-int pcmk__output_cluster_status(pcmk__output_t *out, stonith_t *st, cib_t *cib,
-                                xmlNode *current_cib, enum pcmk__fence_history fence_history,
-                                uint32_t show, uint32_t show_opts, char *only_node,
-                                char *only_rsc, const char *neg_location_prefix,
+int pcmk__output_cluster_status(pcmk__output_t *out, stonith_t *stonith,
+                                cib_t *cib, xmlNode *current_cib,
+                                enum pcmk__fence_history fence_history,
+                                uint32_t show, uint32_t show_opts,
+                                const char *only_node, const char *only_rsc,
+                                const char *neg_location_prefix,
                                 bool simple_output);
 
-int pcmk__status(pcmk__output_t *out, cib_t *cib, enum pcmk__fence_history fence_history,
-                 uint32_t show, uint32_t show_opts, char *only_node, char *only_rsc,
-                 const char *neg_location_prefix, bool simple_output);
+int pcmk__status(pcmk__output_t *out, cib_t *cib,
+                 enum pcmk__fence_history fence_history, uint32_t show,
+                 uint32_t show_opts, const char *only_node,
+                 const char *only_rsc, const char *neg_location_prefix,
+                 bool simple_output, guint timeout_ms);
 
 #ifdef __cplusplus
 }

diff --git a/lib/common/ipc_pacemakerd.c b/lib/common/ipc_pacemakerd.c
@@ -62,6 +62,39 @@ pcmk_pacemakerd_api_daemon_state_enum2text(
     return "invalid";
 }
 
+/*!
+ * \internal
+ * \brief Return a friendly string representation of a \p pacemakerd state
+ *
+ * \param[in] state  \p pacemakerd state
+ *
+ * \return A user-friendly string representation of \p state, or
+ *         <tt>"Invalid pacemakerd state"</tt>
+ */
+const char *
+pcmk__pcmkd_state_enum2friendly(enum pcmk_pacemakerd_state state)
+{
+    switch (state) {
+        case pcmk_pacemakerd_state_init:
+            return "Initializing pacemaker";
+        case pcmk_pacemakerd_state_starting_daemons:
+            return "Pacemaker daemons are starting";
+        case pcmk_pacemakerd_state_wait_for_ping:
+            return "Waiting for startup trigger from SBD";
+        case pcmk_pacemakerd_state_running:
+            return "Pacemaker is running";
+        case pcmk_pacemakerd_state_shutting_down:
+            return "Pacemaker daemons are shutting down";
+        case pcmk_pacemakerd_state_shutdown_complete:
+            /* Assuming pacemakerd won't process messages while in
+             * shutdown_complete state unless reporting to SBD
+             */
+            return "Pacemaker daemons are shut down (reporting to SBD)";
+        default:
+            return "Invalid pacemakerd state";
+    }
+}
+
 // \return Standard Pacemaker return code
 static int
 new_data(pcmk_ipc_api_t *api)
@@ -180,7 +213,7 @@ dispatch(pcmk_ipc_api_t *api, xmlNode *reply)
         reply_data.data.ping.status =
             pcmk__str_eq(crm_element_value(msg_data, XML_PING_ATTR_STATUS), "ok",
                          pcmk__str_casei)?pcmk_rc_ok:pcmk_rc_error;
-        reply_data.data.ping.last_good = (time_t) value_ll;
+        reply_data.data.ping.last_good = (value_ll < 0)? 0 : (time_t) value_ll;
         reply_data.data.ping.sys_from = crm_element_value(msg_data,
                                             XML_PING_ATTR_SYSFROM);
     } else if (pcmk__str_eq(value, CRM_OP_QUIT, pcmk__str_none)) {