WIP: Massive pacemaker-based refactors

daemons/attrd/attrd_alerts.c

@@ -8,12 +8,12 @@
  */
 
 #include <crm_internal.h>
+
 #include <crm/crm.h>
 #include <crm/cib/internal.h>
-#include <crm/cluster/internal.h>
-#include <crm/cluster/election_internal.h>
 #include <crm/common/xml.h>
 #include <crm/lrmd_internal.h>
+
 #include "pacemaker-attrd.h"
 
 static GList *attrd_alert_list = NULL;

daemons/attrd/attrd_cib.c

@@ -18,7 +18,6 @@
 #include <crm/common/logging.h>
 #include <crm/common/results.h>
 #include <crm/common/xml.h>
-#include <crm/cluster/internal.h>   // pcmk__get_node()
 
 #include "pacemaker-attrd.h"
 

daemons/attrd/attrd_corosync.c

@@ -15,7 +15,6 @@
 #include <stdlib.h>
 
 #include <crm/cluster.h>
-#include <crm/cluster/internal.h>
 #include <crm/common/logging.h>
 #include <crm/common/results.h>
 #include <crm/common/xml.h>

daemons/attrd/attrd_elections.c

@@ -12,7 +12,6 @@
 #include <stdbool.h>
 
 #include <crm/cluster.h>
-#include <crm/cluster/election_internal.h>
 #include <crm/common/xml.h>
 
 #include "pacemaker-attrd.h"

daemons/attrd/attrd_ipc.c

@@ -17,7 +17,6 @@
 #include <sys/types.h>
 
 #include <crm/cluster.h>
-#include <crm/cluster/internal.h>
 #include <crm/common/logging.h>
 #include <crm/common/results.h>
 #include <crm/common/util.h>

daemons/attrd/attrd_messages.c

@@ -14,7 +14,6 @@
 
 #include <glib.h>
 
-#include <crm/cluster/internal.h>   // pcmk__get_node()
 #include <crm/common/xml.h>
 
 #include "pacemaker-attrd.h"
@@ -349,7 +348,7 @@ attrd_send_protocol(const pcmk__node_status_t *peer)
     pcmk__xml_free(attrd_op);
 }
 
-gboolean
+void
 attrd_send_message(const pcmk__node_status_t *node, xmlNode *data, bool confirm)
 {
     const char *op = pcmk__xe_get(data, PCMK_XA_TASK);
@@ -366,5 +365,5 @@ attrd_send_message(const pcmk__node_status_t *node, xmlNode *data, bool confirm)
     }
 
     attrd_xml_add_writer(data);
-    return pcmk__cluster_send_message(node, pcmk_ipc_attrd, data);
+    pcmk__cluster_send_message(node, pcmk_ipc_attrd, data);
 }

daemons/attrd/attrd_utils.c

@@ -57,28 +57,16 @@ attrd_shutdown(int nsig)
     // Tell various functions not to do anthing
     shutting_down = true;
 
-    // Don't respond to signals while shutting down
-    mainloop_destroy_signal(SIGTERM);
-    mainloop_destroy_signal(SIGCHLD);
-    mainloop_destroy_signal(SIGPIPE);
-    mainloop_destroy_signal(SIGUSR1);
-    mainloop_destroy_signal(SIGUSR2);
-    mainloop_destroy_signal(SIGTRAP);
-
     attrd_free_waitlist();
     attrd_free_confirmations();
 
     g_clear_pointer(&peer_protocol_vers, g_hash_table_destroy);
 
-    if ((mloop == NULL) || !g_main_loop_is_running(mloop)) {
-        /* If there's no main loop active, just exit. This should be possible
-         * only if we get SIGTERM in brief windows at start-up and shutdown.
-         */
-        crm_exit(CRM_EX_OK);
-    } else {
-        g_main_loop_quit(mloop);
-        g_main_loop_unref(mloop);
-    }
+    // There should be no way to get here without the main loop running
+    CRM_CHECK((mloop != NULL) && g_main_loop_is_running(mloop),
+              crm_exit(CRM_EX_OK));
+
+    g_main_loop_quit(mloop);
 }
 
 /*!
@@ -99,6 +87,7 @@ void
 attrd_run_mainloop(void)
 {
     g_main_loop_run(mloop);
+    g_clear_pointer(&mloop, g_main_loop_unref);
 }
 
 /* strlen("value") */

daemons/attrd/pacemaker-attrd.c

@@ -24,7 +24,6 @@
 #include <crm/common/iso8601.h>
 #include <crm/common/ipc.h>
 #include <crm/common/xml.h>
-#include <crm/cluster/internal.h>
 
 #include "pacemaker-attrd.h"
 

daemons/attrd/pacemaker-attrd.h

@@ -8,7 +8,7 @@
  */
 
 #ifndef PACEMAKER_ATTRD__H
-#  define PACEMAKER_ATTRD__H
+#define PACEMAKER_ATTRD__H
 
 #include <regex.h>
 #include <stdbool.h>
@@ -18,7 +18,7 @@
 
 #include <crm/crm.h>
 #include <crm/cluster.h>
-#include <crm/cluster/election_internal.h>
+#include <crm/cluster/internal.h>
 #include <crm/common/internal.h>
 #include <crm/cib/cib_types.h>
 
@@ -211,8 +211,8 @@ void attrd_client_clear_failure(pcmk__request_t *request);
 void attrd_client_update(pcmk__request_t *request);
 void attrd_client_refresh(pcmk__request_t *request);
 xmlNode *attrd_client_query(pcmk__request_t *request);
-gboolean attrd_send_message(const pcmk__node_status_t *node, xmlNode *data,
-                            bool confirm);
+void attrd_send_message(const pcmk__node_status_t *node, xmlNode *data,
+                        bool confirm);
 
 xmlNode *attrd_add_value_xml(xmlNode *parent, const attribute_t *a,
                              const attribute_value_t *v, bool force_write);
@@ -266,4 +266,4 @@ void attrd_set_node_xml_id(const char *node_name, const char *node_xml_id);
 void attrd_forget_node_xml_id(const char *node_name);
 void attrd_cleanup_xml_ids(void);
 
-#endif /* PACEMAKER_ATTRD__H */
+#endif  // PACEMAKER_ATTRD__H