From bc91cc5d8b4257627d09103cf676cd83656bda8c Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Tue, 12 Jan 2021 10:45:53 -0500

Subject: [PATCH 01/11] Refactor: tools: Split up connection teardown in

 crm_mon.

We don't necessarily want to tear down the fencing and CIB connections

at the same time always.  This can then immediately be used in

mon_refresh_display and do_mon_cib_connection_destroy.

---

 tools/crm_mon.c | 57 +++++++++++++++++++++++++++++++--------------------------

 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c

index 8ec97bb..fc20e4c 100644

--- a/tools/crm_mon.c

+++ b/tools/crm_mon.c

@@ -122,7 +122,8 @@ struct {

     .mon_ops = mon_op_default

 };

-static void clean_up_connections(void);

+static void clean_up_cib_connection(void);

+static void clean_up_fencing_connection(void);

 static crm_exit_t clean_up(crm_exit_t exit_code);

 static void crm_diff_update(const char *event, xmlNode * msg);

 static int mon_refresh_display(gpointer user_data);

@@ -712,12 +713,7 @@ do_mon_cib_connection_destroy(gpointer user_data, bool is_error)

         /* the client API won't properly reconnect notifications

          * if they are still in the table - so remove them

          */

-        st->cmds->remove_notification(st, T_STONITH_NOTIFY_DISCONNECT);

-        st->cmds->remove_notification(st, T_STONITH_NOTIFY_FENCE);

-        st->cmds->remove_notification(st, T_STONITH_NOTIFY_HISTORY);

-        if (st->state != stonith_disconnected) {

-            st->cmds->disconnect(st);

-        }

+        clean_up_fencing_connection();

     }

     if (cib) {

         cib->cmds->signoff(cib);

@@ -851,7 +847,8 @@ cib_connect(gboolean full)

         if (rc != pcmk_ok) {

             out->err(out, "Notification setup failed, could not monitor CIB actions");

-            clean_up_connections();

+            clean_up_cib_connection();

+            clean_up_fencing_connection();

         }

     }

     return rc;

@@ -1866,9 +1863,7 @@ mon_refresh_display(gpointer user_data)

     last_refresh = time(NULL);

     if (cli_config_update(&cib_copy, NULL, FALSE) == FALSE) {

-        if (cib) {

-            cib->cmds->signoff(cib);

-        }

+        clean_up_cib_connection();

         out->err(out, "Upgrade failed: %s", pcmk_strerror(-pcmk_err_schema_validation));

         clean_up(CRM_EX_CONFIG);

         return 0;

@@ -2040,24 +2035,33 @@ mon_st_callback_display(stonith_t * st, stonith_event_t * e)

 }

 static void

-clean_up_connections(void)

+clean_up_cib_connection(void)

 {

-    if (cib != NULL) {

-        cib->cmds->signoff(cib);

-        cib_delete(cib);

-        cib = NULL;

+    if (cib == NULL) {

+        return;

     }

-    if (st != NULL) {

-        if (st->state != stonith_disconnected) {

-            st->cmds->remove_notification(st, T_STONITH_NOTIFY_DISCONNECT);

-            st->cmds->remove_notification(st, T_STONITH_NOTIFY_FENCE);

-            st->cmds->remove_notification(st, T_STONITH_NOTIFY_HISTORY);

-            st->cmds->disconnect(st);

-        }

-        stonith_api_delete(st);

-        st = NULL;

+    cib->cmds->signoff(cib);

+    cib_delete(cib);

+    cib = NULL;

+}

+

+static void

+clean_up_fencing_connection(void)

+{

+    if (st == NULL) {

+        return;

     }

+

+    if (st->state != stonith_disconnected) {

+        st->cmds->remove_notification(st, T_STONITH_NOTIFY_DISCONNECT);

+        st->cmds->remove_notification(st, T_STONITH_NOTIFY_FENCE);

+        st->cmds->remove_notification(st, T_STONITH_NOTIFY_HISTORY);

+        st->cmds->disconnect(st);

+    }

+

+    stonith_api_delete(st);

+    st = NULL;

 }

 /*

@@ -2074,7 +2078,8 @@ clean_up(crm_exit_t exit_code)

     /* Quitting crm_mon is much more complicated than it ought to be. */

     /* (1) Close connections, free things, etc. */

-    clean_up_connections();

+    clean_up_cib_connection();

+    clean_up_fencing_connection();

     free(options.pid_file);

     free(options.neg_location_prefix);

     g_slist_free_full(options.includes_excludes, free);

-- 

1.8.3.1

From 28d646ce67c6a933eaa76aca51f9973a65d0ee3c Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Thu, 7 Jan 2021 17:18:13 -0500

Subject: [PATCH 02/11] Refactor: tools: Split up connection establishment in

 crm_mon.

We don't necessarily always want to connect to the CIB and fencing in

the same action.  Note that bringing up the fencing connection needs to

happen first, because mon_refresh_display is called from cib_connect and

it will want a fencing connection.

---

 tools/crm_mon.c | 66 +++++++++++++++++++++++++++++++++------------------------

 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c

index fc20e4c..301a222 100644

--- a/tools/crm_mon.c

+++ b/tools/crm_mon.c

@@ -128,6 +128,7 @@ static crm_exit_t clean_up(crm_exit_t exit_code);

 static void crm_diff_update(const char *event, xmlNode * msg);

 static int mon_refresh_display(gpointer user_data);

 static int cib_connect(gboolean full);

+static int fencing_connect(void);

 static void mon_st_callback_event(stonith_t * st, stonith_event_t * e);

 static void mon_st_callback_display(stonith_t * st, stonith_event_t * e);

 static void kick_refresh(gboolean data_updated);

@@ -668,8 +669,6 @@ static GOptionEntry deprecated_entries[] = {

 static gboolean

 mon_timer_popped(gpointer data)

 {

-    int rc = pcmk_ok;

-

 #if CURSES_ENABLED

     if (output_format == mon_output_console) {

         clear();

@@ -683,9 +682,7 @@ mon_timer_popped(gpointer data)

     }

     print_as(output_format, "Reconnecting...\n");

-    rc = cib_connect(TRUE);

-

-    if (rc != pcmk_ok) {

+    if (fencing_connect() == pcmk_ok && cib_connect(TRUE) == pcmk_ok) {

         timer_id = g_timeout_add(options.reconnect_msec, mon_timer_popped, NULL);

     }

     return FALSE;

@@ -767,39 +764,48 @@ mon_winresize(int nsig)

 #endif

 static int

-cib_connect(gboolean full)

+fencing_connect(void)

 {

     int rc = pcmk_ok;

-    static gboolean need_pass = TRUE;

-

-    CRM_CHECK(cib != NULL, return -EINVAL);

-

-    if (getenv("CIB_passwd") != NULL) {

-        need_pass = FALSE;

-    }

     if (pcmk_is_set(options.mon_ops, mon_op_fence_connect) && (st == NULL)) {

         st = stonith_api_new();

     }

-    if (pcmk_is_set(options.mon_ops, mon_op_fence_connect)

-        && (st != NULL) && (st->state == stonith_disconnected)) {

+    if (!pcmk_is_set(options.mon_ops, mon_op_fence_connect) ||

+        st == NULL || st->state != stonith_disconnected) {

+        return rc;

+    }

-        rc = st->cmds->connect(st, crm_system_name, NULL);

-        if (rc == pcmk_ok) {

-            crm_trace("Setting up stonith callbacks");

-            if (pcmk_is_set(options.mon_ops, mon_op_watch_fencing)) {

-                st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT,

-                                                mon_st_callback_event);

-                st->cmds->register_notification(st, T_STONITH_NOTIFY_FENCE, mon_st_callback_event);

-            } else {

-                st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT,

-                                                mon_st_callback_display);

-                st->cmds->register_notification(st, T_STONITH_NOTIFY_HISTORY, mon_st_callback_display);

-            }

+    rc = st->cmds->connect(st, crm_system_name, NULL);

+    if (rc == pcmk_ok) {

+        crm_trace("Setting up stonith callbacks");

+        if (pcmk_is_set(options.mon_ops, mon_op_watch_fencing)) {

+            st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT,

+                                            mon_st_callback_event);

+            st->cmds->register_notification(st, T_STONITH_NOTIFY_FENCE, mon_st_callback_event);

+        } else {

+            st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT,

+                                            mon_st_callback_display);

+            st->cmds->register_notification(st, T_STONITH_NOTIFY_HISTORY, mon_st_callback_display);

         }

     }

+    return rc;

+}

+

+static int

+cib_connect(gboolean full)

+{

+    int rc = pcmk_ok;

+    static gboolean need_pass = TRUE;

+

+    CRM_CHECK(cib != NULL, return -EINVAL);

+

+    if (getenv("CIB_passwd") != NULL) {

+        need_pass = FALSE;

+    }

+

     if (cib->state == cib_connected_query || cib->state == cib_connected_command) {

         return rc;

     }

@@ -1373,7 +1379,11 @@ main(int argc, char **argv)

         if (!pcmk_is_set(options.mon_ops, mon_op_one_shot)) {

             print_as(output_format ,"Waiting until cluster is available on this node ...\n");

         }

-        rc = cib_connect(!pcmk_is_set(options.mon_ops, mon_op_one_shot));

+

+        rc = fencing_connect();

+        if (rc == pcmk_ok) {

+            rc = cib_connect(!pcmk_is_set(options.mon_ops, mon_op_one_shot));

+        }

         if (pcmk_is_set(options.mon_ops, mon_op_one_shot)) {

             break;

-- 

1.8.3.1

From e12508ffba06b1c5652e7f49a449aae6d89ec420 Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Tue, 12 Jan 2021 17:01:53 -0500

Subject: [PATCH 03/11] Refactor: tools: Split one shot mode out into its own

 function.

Also, the connection error handling function can get split out on its

own as well to allow it to be reused in both the one shot and loop

cases.

---

 tools/crm_mon.c | 69 +++++++++++++++++++++++++++++++++++----------------------

 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c

index 301a222..b33598b 100644

--- a/tools/crm_mon.c

+++ b/tools/crm_mon.c

@@ -1162,6 +1162,41 @@ reconcile_output_format(pcmk__common_args_t *args) {

     }

 }

+static void

+handle_connection_failures(int rc)

+{

+    if (rc == pcmk_ok) {

+        return;

+    }

+

+    if (output_format == mon_output_monitor) {

+        g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_ERROR, "CLUSTER CRIT: Connection to cluster failed: %s",

+                    pcmk_strerror(rc));

+        rc = MON_STATUS_CRIT;

+    } else if (rc == -ENOTCONN) {

+        g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_ERROR, "Error: cluster is not available on this node");

+        rc = crm_errno2exit(rc);

+    } else {

+        g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_ERROR, "Connection to cluster failed: %s", pcmk_strerror(rc));

+        rc = crm_errno2exit(rc);

+    }

+

+    clean_up(rc);

+}

+

+static void

+one_shot()

+{

+    int rc = fencing_connect();

+

+    if (rc == pcmk_rc_ok) {

+        rc = cib_connect(FALSE);

+        handle_connection_failures(rc);

+    }

+

+    clean_up(CRM_EX_OK);

+}

+

 int

 main(int argc, char **argv)

 {

@@ -1375,20 +1410,19 @@ main(int argc, char **argv)

     crm_info("Starting %s", crm_system_name);

+    if (pcmk_is_set(options.mon_ops, mon_op_one_shot)) {

+        one_shot();

+    }

+

     do {

-        if (!pcmk_is_set(options.mon_ops, mon_op_one_shot)) {

-            print_as(output_format ,"Waiting until cluster is available on this node ...\n");

-        }

+        print_as(output_format ,"Waiting until cluster is available on this node ...\n");

         rc = fencing_connect();

         if (rc == pcmk_ok) {

-            rc = cib_connect(!pcmk_is_set(options.mon_ops, mon_op_one_shot));

+            rc = cib_connect(TRUE);

         }

-        if (pcmk_is_set(options.mon_ops, mon_op_one_shot)) {

-            break;

-

-        } else if (rc != pcmk_ok) {

+        if (rc != pcmk_ok) {

             sleep(options.reconnect_msec / 1000);

 #if CURSES_ENABLED

             if (output_format == mon_output_console) {

@@ -1402,24 +1436,7 @@ main(int argc, char **argv)

     } while (rc == -ENOTCONN);

-    if (rc != pcmk_ok) {

-        if (output_format == mon_output_monitor) {

-            g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_ERROR, "CLUSTER CRIT: Connection to cluster failed: %s",

-                        pcmk_strerror(rc));

-            return clean_up(MON_STATUS_CRIT);

-        } else {

-            if (rc == -ENOTCONN) {

-                g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_ERROR, "Error: cluster is not available on this node");

-            } else {

-                g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_ERROR, "Connection to cluster failed: %s", pcmk_strerror(rc));

-            }

-        }

-        return clean_up(crm_errno2exit(rc));

-    }

-

-    if (pcmk_is_set(options.mon_ops, mon_op_one_shot)) {

-        return clean_up(CRM_EX_OK);

-    }

+    handle_connection_failures(rc);

     mainloop = g_main_loop_new(NULL, FALSE);

-- 

1.8.3.1

From 0eb307a19d57d4a59a4b51a64a3b62dcd0b7cc9a Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Wed, 13 Jan 2021 12:47:41 -0500

Subject: [PATCH 04/11] Refactor: tools: Don't call mon_refresh_display from

 cib_connect.

---

 tools/crm_mon.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c

index b33598b..b0daf76 100644

--- a/tools/crm_mon.c

+++ b/tools/crm_mon.c

@@ -683,6 +683,7 @@ mon_timer_popped(gpointer data)

     print_as(output_format, "Reconnecting...\n");

     if (fencing_connect() == pcmk_ok && cib_connect(TRUE) == pcmk_ok) {

+        mon_refresh_display(NULL);

         timer_id = g_timeout_add(options.reconnect_msec, mon_timer_popped, NULL);

     }

     return FALSE;

@@ -831,9 +832,6 @@ cib_connect(gboolean full)

     }

     rc = cib->cmds->query(cib, NULL, &current_cib, cib_scope_local | cib_sync_call);

-    if (rc == pcmk_ok) {

-        mon_refresh_display(NULL);

-    }

     if (rc == pcmk_ok && full) {

         rc = cib->cmds->set_connection_dnotify(cib, mon_cib_connection_destroy_regular);

@@ -1192,6 +1190,7 @@ one_shot()

     if (rc == pcmk_rc_ok) {

         rc = cib_connect(FALSE);

         handle_connection_failures(rc);

+        mon_refresh_display(NULL);

     }

     clean_up(CRM_EX_OK);

@@ -1437,6 +1436,7 @@ main(int argc, char **argv)

     } while (rc == -ENOTCONN);

     handle_connection_failures(rc);

+    mon_refresh_display(NULL);

     mainloop = g_main_loop_new(NULL, FALSE);

-- 

1.8.3.1

From 46696d3135e699c58918e41c93c357d951146d5c Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Wed, 13 Jan 2021 13:52:49 -0500

Subject: [PATCH 05/11] Fix: tools: Report if getting fencing history failed in

 crm_mon.

This just takes history_rc into account in the text and html formatters.

It was already used by the XML formatter.  If we can't get fencing

history, add a message to the output indicating that happened.

---

 tools/crm_mon.c       | 13 +++++----

 tools/crm_mon.h       | 12 ++++-----

 tools/crm_mon_print.c | 74 ++++++++++++++++++++++++++++++++++++++-------------

 3 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c

index b0daf76..1a68555 100644

--- a/tools/crm_mon.c

+++ b/tools/crm_mon.c

@@ -1943,7 +1943,8 @@ mon_refresh_display(gpointer user_data)

     switch (output_format) {

         case mon_output_html:

         case mon_output_cgi:

-            if (print_html_status(out, mon_data_set, stonith_history, options.mon_ops,

+            if (print_html_status(out, mon_data_set, crm_errno2exit(history_rc),

+                                  stonith_history, options.mon_ops,

                                   show, options.neg_location_prefix,

                                   options.only_node, options.only_rsc) != 0) {

                 g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_CANTCREAT, "Critical: Unable to output html file");

@@ -1974,15 +1975,17 @@ mon_refresh_display(gpointer user_data)

              */

 #if CURSES_ENABLED

             blank_screen();

-            print_status(out, mon_data_set, stonith_history, options.mon_ops, show,

-                         options.neg_location_prefix, options.only_node, options.only_rsc);

+            print_status(out, mon_data_set, crm_errno2exit(history_rc), stonith_history,

+                         options.mon_ops, show, options.neg_location_prefix,

+                         options.only_node, options.only_rsc);

             refresh();

             break;

 #endif

         case mon_output_plain:

-            print_status(out, mon_data_set, stonith_history, options.mon_ops, show,

-                         options.neg_location_prefix, options.only_node, options.only_rsc);

+            print_status(out, mon_data_set, crm_errno2exit(history_rc), stonith_history,

+                         options.mon_ops, show, options.neg_location_prefix,

+                         options.only_node, options.only_rsc);

             break;

         case mon_output_unset:

diff --git a/tools/crm_mon.h b/tools/crm_mon.h

index f746507..73c926d 100644

--- a/tools/crm_mon.h

+++ b/tools/crm_mon.h

@@ -95,17 +95,17 @@ typedef enum mon_output_format_e {

 #define mon_op_default              (mon_op_print_pending | mon_op_fence_history | mon_op_fence_connect)

 void print_status(pcmk__output_t *out, pe_working_set_t *data_set,

-                  stonith_history_t *stonith_history, unsigned int mon_ops,

-                  unsigned int show, char *prefix, char *only_node,

-                  char *only_rsc);

+                  crm_exit_t history_rc, stonith_history_t *stonith_history,

+                  unsigned int mon_ops, unsigned int show, char *prefix,

+                  char *only_node, char *only_rsc);

 void print_xml_status(pcmk__output_t *out, pe_working_set_t *data_set,

                       crm_exit_t history_rc, stonith_history_t *stonith_history,

                       unsigned int mon_ops, unsigned int show, char *prefix,

                       char *only_node, char *only_rsc);

 int print_html_status(pcmk__output_t *out, pe_working_set_t *data_set,

-                      stonith_history_t *stonith_history, unsigned int mon_ops,

-                      unsigned int show, char *prefix, char *only_node,

-                      char *only_rsc);

+                      crm_exit_t history_rc, stonith_history_t *stonith_history,

+                      unsigned int mon_ops, unsigned int show, char *prefix,

+                      char *only_node, char *only_rsc);

 GList *append_attr_list(GList *attr_list, char *name);

 void blank_screen(void);

diff --git a/tools/crm_mon_print.c b/tools/crm_mon_print.c

index 8ae11bf..73406bd 100644

--- a/tools/crm_mon_print.c

+++ b/tools/crm_mon_print.c

@@ -656,6 +656,7 @@ print_failed_actions(pcmk__output_t *out, pe_working_set_t *data_set,

  *

  * \param[in] out             The output functions structure.

  * \param[in] data_set        Cluster state to display.

+ * \param[in] history_rc      Result of getting stonith history

  * \param[in] stonith_history List of stonith actions.

  * \param[in] mon_ops         Bitmask of mon_op_*.

  * \param[in] show            Bitmask of mon_show_*.

@@ -663,14 +664,16 @@ print_failed_actions(pcmk__output_t *out, pe_working_set_t *data_set,

  */

 void

 print_status(pcmk__output_t *out, pe_working_set_t *data_set,

-             stonith_history_t *stonith_history, unsigned int mon_ops,

-             unsigned int show, char *prefix, char *only_node, char *only_rsc)

+             crm_exit_t history_rc, stonith_history_t *stonith_history,

+             unsigned int mon_ops, unsigned int show, char *prefix,

+             char *only_node, char *only_rsc)

 {

     GListPtr unames = NULL;

     GListPtr resources = NULL;

     unsigned int print_opts = get_resource_display_options(mon_ops);

     int rc = pcmk_rc_no_output;

+    bool already_printed_failure = false;

     CHECK_RC(rc, out->message(out, "cluster-summary", data_set,

                               pcmk_is_set(mon_ops, mon_op_print_clone_detail),

@@ -731,13 +734,23 @@ print_status(pcmk__output_t *out, pe_working_set_t *data_set,

     if (pcmk_is_set(show, mon_show_fence_failed)

         && pcmk_is_set(mon_ops, mon_op_fence_history)) {

-        stonith_history_t *hp = stonith__first_matching_event(stonith_history, stonith__event_state_eq,

-                                                              GINT_TO_POINTER(st_failed));

+        if (history_rc == 0) {

+            stonith_history_t *hp = stonith__first_matching_event(stonith_history, stonith__event_state_eq,

+                                                                  GINT_TO_POINTER(st_failed));

+

+            if (hp) {

+                CHECK_RC(rc, out->message(out, "failed-fencing-list", stonith_history, unames,

+                                          pcmk_is_set(mon_ops, mon_op_fence_full_history),

+                                          rc == pcmk_rc_ok));

+            }

+        } else {

+            PCMK__OUTPUT_SPACER_IF(out, rc == pcmk_rc_ok);

+            out->begin_list(out, NULL, NULL, "Failed Fencing Actions");

+            out->list_item(out, NULL, "Failed to get fencing history: %s",

+                           crm_exit_str(history_rc));

+            out->end_list(out);

-        if (hp) {

-            CHECK_RC(rc, out->message(out, "failed-fencing-list", stonith_history, unames,

-                                      pcmk_is_set(mon_ops, mon_op_fence_full_history),

-                                      rc == pcmk_rc_ok));

+            already_printed_failure = true;

         }

     }

@@ -754,7 +767,15 @@ print_status(pcmk__output_t *out, pe_working_set_t *data_set,

     /* Print stonith history */

     if (pcmk_is_set(mon_ops, mon_op_fence_history)) {

-        if (pcmk_is_set(show, mon_show_fence_worked)) {

+        if (history_rc != 0) {

+            if (!already_printed_failure) {

+                PCMK__OUTPUT_SPACER_IF(out, rc == pcmk_rc_ok);

+                out->begin_list(out, NULL, NULL, "Failed Fencing Actions");

+                out->list_item(out, NULL, "Failed to get fencing history: %s",

+                               crm_exit_str(history_rc));

+                out->end_list(out);

+            }

+        } else if (pcmk_is_set(show, mon_show_fence_worked)) {

             stonith_history_t *hp = stonith__first_matching_event(stonith_history, stonith__event_state_neq,

                                                                   GINT_TO_POINTER(st_failed));

@@ -783,6 +804,7 @@ print_status(pcmk__output_t *out, pe_working_set_t *data_set,

  *

  * \param[in] out             The output functions structure.

  * \param[in] data_set        Cluster state to display.

+ * \param[in] history_rc      Result of getting stonith history

  * \param[in] stonith_history List of stonith actions.

  * \param[in] mon_ops         Bitmask of mon_op_*.

  * \param[in] show            Bitmask of mon_show_*.

@@ -878,6 +900,7 @@ print_xml_status(pcmk__output_t *out, pe_working_set_t *data_set,

  *

  * \param[in] out             The output functions structure.

  * \param[in] data_set        Cluster state to display.

+ * \param[in] history_rc      Result of getting stonith history

  * \param[in] stonith_history List of stonith actions.

  * \param[in] mon_ops         Bitmask of mon_op_*.

  * \param[in] show            Bitmask of mon_show_*.

@@ -885,14 +908,15 @@ print_xml_status(pcmk__output_t *out, pe_working_set_t *data_set,

  */

 int

 print_html_status(pcmk__output_t *out, pe_working_set_t *data_set,

-                  stonith_history_t *stonith_history, unsigned int mon_ops,

-                  unsigned int show, char *prefix, char *only_node,

-                  char *only_rsc)

+                  crm_exit_t history_rc, stonith_history_t *stonith_history,

+                  unsigned int mon_ops, unsigned int show, char *prefix,

+                  char *only_node, char *only_rsc)

 {

     GListPtr unames = NULL;

     GListPtr resources = NULL;

     unsigned int print_opts = get_resource_display_options(mon_ops);

+    bool already_printed_failure = false;

     out->message(out, "cluster-summary", data_set,

                  pcmk_is_set(mon_ops, mon_op_print_clone_detail),

@@ -950,18 +974,32 @@ print_html_status(pcmk__output_t *out, pe_working_set_t *data_set,

     if (pcmk_is_set(show, mon_show_fence_failed)

         && pcmk_is_set(mon_ops, mon_op_fence_history)) {

-        stonith_history_t *hp = stonith__first_matching_event(stonith_history, stonith__event_state_eq,

-                                                              GINT_TO_POINTER(st_failed));

+        if (history_rc == 0) {

+            stonith_history_t *hp = stonith__first_matching_event(stonith_history, stonith__event_state_eq,

+                                                                  GINT_TO_POINTER(st_failed));

-        if (hp) {

-            out->message(out, "failed-fencing-list", stonith_history, unames,

-                         pcmk_is_set(mon_ops, mon_op_fence_full_history), FALSE);

+            if (hp) {

+                out->message(out, "failed-fencing-list", stonith_history, unames,

+                             pcmk_is_set(mon_ops, mon_op_fence_full_history), FALSE);

+            }

+        } else {

+            out->begin_list(out, NULL, NULL, "Failed Fencing Actions");

+            out->list_item(out, NULL, "Failed to get fencing history: %s",

+                           crm_exit_str(history_rc));

+            out->end_list(out);

         }

     }

     /* Print stonith history */

     if (pcmk_is_set(mon_ops, mon_op_fence_history)) {

-        if (pcmk_is_set(show, mon_show_fence_worked)) {

+        if (history_rc != 0) {

+            if (!already_printed_failure) {

+                out->begin_list(out, NULL, NULL, "Failed Fencing Actions");

+                out->list_item(out, NULL, "Failed to get fencing history: %s",

+                               crm_exit_str(history_rc));

+                out->end_list(out);

+            }

+        } else if (pcmk_is_set(show, mon_show_fence_worked)) {

             stonith_history_t *hp = stonith__first_matching_event(stonith_history, stonith__event_state_neq,

                                                                   GINT_TO_POINTER(st_failed));

-- 

1.8.3.1

From 2e391be6fdbbbccd6aef49b3f109e5c342eb5dcc Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Mon, 11 Jan 2021 12:54:40 -0500

Subject: [PATCH 06/11] Fix: tools: A lack of stonith history is not fatal in

 crm_mon.

Instead, print out all the rest of the typical output.  This should also

include an error message in the fencing section, if that section was

requested.

See: rhbz#1880426

---

 tools/crm_mon.c | 40 ++++++++++++++++------------------------

 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c

index 1a68555..17b8ee9 100644

--- a/tools/crm_mon.c

+++ b/tools/crm_mon.c

@@ -682,7 +682,8 @@ mon_timer_popped(gpointer data)

     }

     print_as(output_format, "Reconnecting...\n");

-    if (fencing_connect() == pcmk_ok && cib_connect(TRUE) == pcmk_ok) {

+    fencing_connect();

+    if (cib_connect(TRUE) == pcmk_ok) {

         mon_refresh_display(NULL);

         timer_id = g_timeout_add(options.reconnect_msec, mon_timer_popped, NULL);

     }

@@ -726,12 +727,6 @@ mon_cib_connection_destroy_regular(gpointer user_data)

     do_mon_cib_connection_destroy(user_data, false);

 }

-static void

-mon_cib_connection_destroy_error(gpointer user_data)

-{

-    do_mon_cib_connection_destroy(user_data, true);

-}

-

 /*

  * Mainloop signal handler.

  */

@@ -790,6 +785,8 @@ fencing_connect(void)

                                             mon_st_callback_display);

             st->cmds->register_notification(st, T_STONITH_NOTIFY_HISTORY, mon_st_callback_display);

         }

+    } else {

+        st = NULL;

     }

     return rc;

@@ -1185,12 +1182,15 @@ handle_connection_failures(int rc)

 static void

 one_shot()

 {

-    int rc = fencing_connect();

+    int rc;