Introduce a pcmk__daemon_t object and use it for mainloop/shutdown

daemons/attrd/attrd_cib.c

@@ -33,15 +33,14 @@ attrd_cib_destroy_cb(void *user_data)
 
     cib->cmds->signoff(cib);
 
-    if (attrd_shutting_down()) {
+    if (attrd.shutting_down) {
         pcmk__info("Disconnected from the CIB manager");
-
-    } else {
-        // @TODO This should trigger a reconnect, not a shutdown
-        pcmk__crit("Lost connection to the CIB manager, shutting down");
-        attrd_exit_status = CRM_EX_DISCONNECT;
-        attrd_shutdown(0);
+        return;
     }
+
+    // @TODO This should trigger a reconnect, not a shutdown
+    pcmk__crit("Lost connection to the CIB manager, shutting down");
+    pcmk__daemon_quit(&attrd, CRM_EX_DISCONNECT);
 }
 
 static void
@@ -56,7 +55,7 @@ attrd_cib_updated_cb(const char *event, xmlNode *msg)
     }
 
     if (pcmk__cib_element_in_patchset(patchset, PCMK_XE_ALERTS)) {
-        if (attrd_shutting_down()) {
+        if (attrd.shutting_down) {
             pcmk__debug("Ignoring alerts change in CIB during shutdown");
         } else {
             mainloop_set_trigger(attrd_config_read);
@@ -81,7 +80,7 @@ attrd_cib_updated_cb(const char *event, xmlNode *msg)
     if (status_changed
         || pcmk__cib_element_in_patchset(patchset, PCMK_XE_NODES)) {
 
-        if (attrd_shutting_down()) {
+        if (attrd.shutting_down) {
             pcmk__debug("Ignoring node change in CIB during shutdown");
             return;
         }
@@ -154,7 +153,10 @@ attrd_cib_connect(int max_retry)
 void
 attrd_cib_disconnect(void)
 {
-    CRM_CHECK(the_cib != NULL, return);
+    if (the_cib == NULL) {
+        return;
+    }
+
     the_cib->cmds->del_notify_callback(the_cib, PCMK__VALUE_CIB_DIFF_NOTIFY,
                                        attrd_cib_updated_cb);
     cib__clean_up_connection(&the_cib);
@@ -518,7 +520,7 @@ write_attribute(attribute_t *a, bool ignore_delay)
     }
 
     // Private attributes (or any in standalone mode) are not written to the CIB
-    if (attrd_stand_alone() || pcmk__is_set(a->flags, attrd_attr_is_private)) {
+    if (attrd.stand_alone || pcmk__is_set(a->flags, attrd_attr_is_private)) {
         should_write = false;
     }
 

daemons/attrd/attrd_corosync.c

@@ -82,7 +82,7 @@ attrd_peer_message(pcmk__node_status_t *peer, xmlNode *xml)
         return;
     }
 
-    if (attrd_shutting_down()) {
+    if (attrd.shutting_down) {
         /* If we're shutting down, we want to continue responding to election
          * ops as long as we're a cluster member (because our vote may be
          * needed). Ignore all other messages.
@@ -179,14 +179,13 @@ attrd_cpg_dispatch(cpg_handle_t handle, const struct cpg_name *group_name,
 static void
 attrd_cpg_destroy(void *unused)
 {
-    if (attrd_shutting_down()) {
+    if (attrd.shutting_down) {
         pcmk__info("Disconnected from Corosync process group");
-
-    } else {
-        pcmk__crit("Lost connection to Corosync process group, shutting down");
-        attrd_exit_status = CRM_EX_DISCONNECT;
-        attrd_shutdown(0);
+        return;
     }
+
+    pcmk__crit("Lost connection to Corosync process group, shutting down");
+    pcmk__daemon_quit(&attrd, CRM_EX_DISCONNECT);
 }
 #endif // SUPPORT_COROSYNC
 
@@ -511,7 +510,10 @@ attrd_cluster_connect(void)
     pcmk__cluster_set_status_callback(&attrd_peer_change_cb);
 
     rc = pcmk_cluster_connect(attrd_cluster);
-    if (rc != pcmk_rc_ok) {
+
+    if (rc == pcmk_rc_ok) {
+        pcmk__info("Cluster connection active");
+    } else {
         pcmk__err("Cluster connection failed");
     }
 

daemons/attrd/attrd_elections.c

@@ -46,7 +46,7 @@ attrd_start_election_if_needed(void)
 {
     if ((peer_writer == NULL)
         && (election_state(attrd_cluster) != election_in_progress)
-        && !attrd_shutting_down()) {
+        && !attrd.shutting_down) {
 
         pcmk__info("Starting an election to determine the writer");
         election_vote(attrd_cluster);
@@ -68,7 +68,7 @@ attrd_handle_election_op(const pcmk__node_status_t *peer, xmlNode *xml)
     pcmk__xe_set(xml, PCMK__XA_SRC, peer->name);
 
     // Don't become writer if we're shutting down
-    rc = election_count_vote(attrd_cluster, xml, !attrd_shutting_down());
+    rc = election_count_vote(attrd_cluster, xml, !attrd.shutting_down);
 
     switch(rc) {
         case election_start:

daemons/attrd/attrd_ipc.c

@@ -492,7 +492,7 @@ static int32_t
 attrd_ipc_accept(qb_ipcs_connection_t *c, uid_t uid, gid_t gid)
 {
     pcmk__trace("New client connection %p", c);
-    if (attrd_shutting_down()) {
+    if (attrd.shutting_down) {
         pcmk__info("Ignoring new connection from pid %d during shutdown",
                    pcmk__client_pid(c));
         return -ECONNREFUSED;
@@ -649,8 +649,9 @@ attrd_ipc_cleanup(void)
  * \internal
  * \brief Set up attrd IPC communication
  */
-void
+bool
 attrd_ipc_init(void)
 {
     pcmk__serve_attrd_ipc(&ipcs, &ipc_callbacks);
+    return ipcs != NULL;
 }

daemons/attrd/attrd_utils.c

@@ -24,83 +24,11 @@
 
 cib_t *the_cib = NULL;
 
-static bool shutting_down = false;
-static GMainLoop *mloop = NULL;
-
 /* A hash table storing information on the protocol version of each peer attrd.
  * The key is the peer's uname, and the value is the protocol version number.
  */
 GHashTable *peer_protocol_vers = NULL;
 
-/*!
- * \internal
- * \brief Check whether local attribute manager is shutting down
- *
- * \return \c true if local attribute manager has begun shutdown sequence,
- *         otherwise \c false
- */
-bool
-attrd_shutting_down(void)
-{
-    return shutting_down;
-}
-
-/*!
- * \internal
- * \brief  Exit (using mainloop or not, as appropriate)
- *
- * \param[in] nsig  Ignored
- */
-void
-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);
-    }
-}
-
-/*!
- * \internal
- * \brief Create a main loop for attrd
- */
-void
-attrd_init_mainloop(void)
-{
-    mloop = g_main_loop_new(NULL, FALSE);
-}
-
-/*!
- * \internal
- * \brief Run attrd main loop
- */
-void
-attrd_run_mainloop(void)
-{
-    g_main_loop_run(mloop);
-}
-
 /* strlen("value") */
 #define plus_plus_len (5)