Blame SOURCES/011-feature-set.patch

c563b9
From ea78f9a90e35be15482129e1bdb9c6d86a9a5015 Mon Sep 17 00:00:00 2001
c563b9
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
c563b9
Date: Thu, 29 Oct 2020 13:41:41 +0100
c563b9
Subject: [PATCH 1/2] Refactor: crmadmin: prepare functions to move to
c563b9
 libpacemaker
c563b9
c563b9
---
c563b9
 tools/crmadmin.c | 321 +++++++++++++++++++++++++++++++++----------------------
c563b9
 1 file changed, 196 insertions(+), 125 deletions(-)
c563b9
c563b9
diff --git a/tools/crmadmin.c b/tools/crmadmin.c
c563b9
index e61dbf4..ec902df 100644
c563b9
--- a/tools/crmadmin.c
c563b9
+++ b/tools/crmadmin.c
c563b9
@@ -36,7 +36,6 @@ static guint message_timeout_ms = DEFAULT_MESSAGE_TIMEOUT_MS;
c563b9
 static GMainLoop *mainloop = NULL;
c563b9
 
c563b9
 bool need_controld_api = true;
c563b9
-bool need_pacemakerd_api = false;
c563b9
 
c563b9
 bool do_work(pcmk_ipc_api_t *api);
c563b9
 static char *ipc_name = NULL;
c563b9
@@ -135,8 +134,6 @@ command_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError
c563b9
 
c563b9
     if (!strcmp(option_name, "--pacemakerd") || !strcmp(option_name, "-P")) {
c563b9
         command = cmd_pacemakerd_health;
c563b9
-        need_pacemakerd_api = true;
c563b9
-        need_controld_api = false;
c563b9
     }
c563b9
 
c563b9
     if (!strcmp(option_name, "--dc_lookup") || !strcmp(option_name, "-D")) {
c563b9
@@ -145,7 +142,6 @@ command_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError
c563b9
 
c563b9
     if (!strcmp(option_name, "--nodes") || !strcmp(option_name, "-N")) {
c563b9
         command = cmd_list_nodes;
c563b9
-        need_controld_api = false;
c563b9
     }
c563b9
 
c563b9
     if (!strcmp(option_name, "--election") || !strcmp(option_name, "-E")) {
c563b9
@@ -353,6 +349,16 @@ static pcmk__supported_format_t formats[] = {
c563b9
 };
c563b9
 
c563b9
 static void
c563b9
+start_main_loop()
c563b9
+{
c563b9
+        exit_code = CRM_EX_DISCONNECT; // For unexpected disconnects
c563b9
+        mainloop = g_main_loop_new(NULL, FALSE);
c563b9
+        message_timer_id = g_timeout_add(message_timeout_ms,
c563b9
+                                         admin_message_timeout, NULL);
c563b9
+        g_main_loop_run(mainloop);
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
 quit_main_loop(crm_exit_t ec)
c563b9
 {
c563b9
     exit_code = ec;
c563b9
@@ -366,9 +372,14 @@ quit_main_loop(crm_exit_t ec)
c563b9
 }
c563b9
 
c563b9
 static void
c563b9
-controller_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
-                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
-                    void *event_data, void *user_data)
c563b9
+event_done(pcmk_ipc_api_t *api)
c563b9
+{
c563b9
+    pcmk_disconnect_ipc(api);
c563b9
+    quit_main_loop(exit_code);
c563b9
+}
c563b9
+
c563b9
+static pcmk_controld_api_reply_t *
c563b9
+controld_event_reply(pcmk_ipc_api_t *controld_api, enum pcmk_ipc_event event_type, crm_exit_t status, void *event_data)
c563b9
 {
c563b9
     pcmk_controld_api_reply_t *reply = event_data;
c563b9
 
c563b9
@@ -377,14 +388,14 @@ controller_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
             if (exit_code == CRM_EX_DISCONNECT) { // Unexpected
c563b9
                 out->err(out, "error: Lost connection to controller");
c563b9
             }
c563b9
-            goto done;
c563b9
-            break;
c563b9
+            event_done(controld_api);
c563b9
+            return NULL;
c563b9
 
c563b9
         case pcmk_ipc_event_reply:
c563b9
             break;
c563b9
 
c563b9
         default:
c563b9
-            return;
c563b9
+            return NULL;
c563b9
     }
c563b9
 
c563b9
     if (message_timer_id != 0) {
c563b9
@@ -396,39 +407,54 @@ controller_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
         out->err(out, "error: Bad reply from controller: %s",
c563b9
                 crm_exit_str(status));
c563b9
         exit_code = status;
c563b9
-        goto done;
c563b9
+        event_done(controld_api);
c563b9
+        return NULL;
c563b9
     }
c563b9
 
c563b9
     if (reply->reply_type != pcmk_controld_reply_ping) {
c563b9
         out->err(out, "error: Unknown reply type %d from controller",
c563b9
                 reply->reply_type);
c563b9
-        goto done;
c563b9
+        event_done(controld_api);
c563b9
+        return NULL;
c563b9
     }
c563b9
 
c563b9
-    // Parse desired information from reply
c563b9
-    switch (command) {
c563b9
-        case cmd_health:
c563b9
-            out->message(out, "health",
c563b9
-                   reply->data.ping.sys_from,
c563b9
-                   reply->host_from,
c563b9
-                   reply->data.ping.fsa_state,
c563b9
-                   reply->data.ping.result);
c563b9
-            exit_code = CRM_EX_OK;
c563b9
-            break;
c563b9
+    return reply;
c563b9
+}
c563b9
 
c563b9
-        case cmd_whois_dc:
c563b9
-            out->message(out, "dc", reply->host_from);
c563b9
-            exit_code = CRM_EX_OK;
c563b9
-            break;
c563b9
+static void
c563b9
+controller_status_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
+                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
+                    void *event_data, void *user_data)
c563b9
+{
c563b9
+    pcmk_controld_api_reply_t *reply = controld_event_reply(controld_api,
c563b9
+        event_type, status, event_data);
c563b9
 
c563b9
-        default: // Not really possible here
c563b9
-            exit_code = CRM_EX_SOFTWARE;
c563b9
-            break;
c563b9
+    if (reply != NULL) {
c563b9
+        out->message(out, "health",
c563b9
+               reply->data.ping.sys_from,
c563b9
+               reply->host_from,
c563b9
+               reply->data.ping.fsa_state,
c563b9
+               reply->data.ping.result);
c563b9
+        exit_code = CRM_EX_OK;
c563b9
     }
c563b9
 
c563b9
-done:
c563b9
-    pcmk_disconnect_ipc(controld_api);
c563b9
-    quit_main_loop(exit_code);
c563b9
+    event_done(controld_api);
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+designated_controller_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
+                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
+                    void *event_data, void *user_data)
c563b9
+{
c563b9
+    pcmk_controld_api_reply_t *reply = controld_event_reply(controld_api,
c563b9
+        event_type, status, event_data);
c563b9
+
c563b9
+    if (reply != NULL) {
c563b9
+        out->message(out, "dc", reply->host_from);
c563b9
+        exit_code = CRM_EX_OK;
c563b9
+    }
c563b9
+
c563b9
+    event_done(controld_api);
c563b9
 }
c563b9
 
c563b9
 static void
c563b9
@@ -438,13 +464,16 @@ pacemakerd_event_cb(pcmk_ipc_api_t *pacemakerd_api,
c563b9
 {
c563b9
     pcmk_pacemakerd_api_reply_t *reply = event_data;
c563b9
 
c563b9
+    crm_time_t *crm_when = crm_time_new(NULL);
c563b9
+    char *pinged_buf = NULL;
c563b9
+
c563b9
     switch (event_type) {
c563b9
         case pcmk_ipc_event_disconnect:
c563b9
             if (exit_code == CRM_EX_DISCONNECT) { // Unexpected
c563b9
                 out->err(out, "error: Lost connection to pacemakerd");
c563b9
             }
c563b9
-            goto done;
c563b9
-            break;
c563b9
+            event_done(pacemakerd_api);
c563b9
+            return;
c563b9
 
c563b9
         case pcmk_ipc_event_reply:
c563b9
             break;
c563b9
@@ -461,52 +490,119 @@ pacemakerd_event_cb(pcmk_ipc_api_t *pacemakerd_api,
c563b9
     if (status != CRM_EX_OK) {
c563b9
         out->err(out, "error: Bad reply from pacemakerd: %s",
c563b9
                 crm_exit_str(status));
c563b9
-        exit_code = status;
c563b9
-        goto done;
c563b9
+        event_done(pacemakerd_api);
c563b9
+        return;
c563b9
     }
c563b9
 
c563b9
     if (reply->reply_type != pcmk_pacemakerd_reply_ping) {
c563b9
         out->err(out, "error: Unknown reply type %d from pacemakerd",
c563b9
                 reply->reply_type);
c563b9
-        goto done;
c563b9
+        event_done(pacemakerd_api);
c563b9
+        return;
c563b9
     }
c563b9
 
c563b9
     // Parse desired information from reply
c563b9
-    switch (command) {
c563b9
-        case cmd_pacemakerd_health:
c563b9
-            {
c563b9
-                crm_time_t *crm_when = crm_time_new(NULL);
c563b9
-                char *pinged_buf = NULL;
c563b9
-
c563b9
-                crm_time_set_timet(crm_when, &reply->data.ping.last_good);
c563b9
-                pinged_buf = crm_time_as_string(crm_when,
c563b9
-                    crm_time_log_date | crm_time_log_timeofday |
c563b9
-                        crm_time_log_with_timezone);
c563b9
-
c563b9
-                out->message(out, "pacemakerd-health",
c563b9
-                    reply->data.ping.sys_from,
c563b9
-                    (reply->data.ping.status == pcmk_rc_ok)?
c563b9
-                        pcmk_pacemakerd_api_daemon_state_enum2text(
c563b9
-                            reply->data.ping.state):"query failed",
c563b9
-                    (reply->data.ping.status == pcmk_rc_ok)?pinged_buf:"");
c563b9
-                exit_code = CRM_EX_OK;
c563b9
-                free(pinged_buf);
c563b9
-            }
c563b9
-            break;
c563b9
+    crm_time_set_timet(crm_when, &reply->data.ping.last_good);
c563b9
+    pinged_buf = crm_time_as_string(crm_when,
c563b9
+        crm_time_log_date | crm_time_log_timeofday |
c563b9
+            crm_time_log_with_timezone);
c563b9
+
c563b9
+    out->message(out, "pacemakerd-health",
c563b9
+        reply->data.ping.sys_from,
c563b9
+        (reply->data.ping.status == pcmk_rc_ok)?
c563b9
+            pcmk_pacemakerd_api_daemon_state_enum2text(
c563b9
+                reply->data.ping.state):"query failed",
c563b9
+        (reply->data.ping.status == pcmk_rc_ok)?pinged_buf:"");
c563b9
+    exit_code = CRM_EX_OK;
c563b9
+    free(pinged_buf);
c563b9
+
c563b9
+    event_done(pacemakerd_api);
c563b9
+}
c563b9
 
c563b9
-        default: // Not really possible here
c563b9
-            exit_code = CRM_EX_SOFTWARE;
c563b9
-            break;
c563b9
+static pcmk_ipc_api_t *
c563b9
+ipc_connect(enum pcmk_ipc_server server, pcmk_ipc_callback_t cb)
c563b9
+{
c563b9
+    int rc;
c563b9
+    pcmk_ipc_api_t *api = NULL;
c563b9
+
c563b9
+    rc = pcmk_new_ipc_api(&api, server);
c563b9
+    if (api == NULL) {
c563b9
+        out->err(out, "error: Could not connect to %s: %s",
c563b9
+                (server == pcmk_ipc_controld) ? "controller" : "pacemakerd",
c563b9
+                pcmk_rc_str(rc));
c563b9
+        exit_code = pcmk_rc2exitc(rc);
c563b9
+        return NULL;
c563b9
+    }
c563b9
+    pcmk_register_ipc_callback(api, cb, NULL);
c563b9
+    rc = pcmk_connect_ipc(api, pcmk_ipc_dispatch_main);
c563b9
+    if (rc != pcmk_rc_ok) {
c563b9
+        out->err(out, "error: Could not connect to %s: %s",
c563b9
+                (server == pcmk_ipc_controld) ? "controller" : "pacemakerd",
c563b9
+                pcmk_rc_str(rc));
c563b9
+        exit_code = pcmk_rc2exitc(rc);
c563b9
+        return NULL;
c563b9
     }
c563b9
 
c563b9
-done:
c563b9
-    pcmk_disconnect_ipc(pacemakerd_api);
c563b9
-    quit_main_loop(exit_code);
c563b9
+    return api;
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+pcmk__controller_status()
c563b9
+{
c563b9
+    pcmk_ipc_api_t *controld_api = ipc_connect(pcmk_ipc_controld, controller_status_event_cb);
c563b9
+
c563b9
+    if (controld_api != NULL) {
c563b9
+        int rc = pcmk_controld_api_ping(controld_api, dest_node);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            exit_code = pcmk_rc2exitc(rc);
c563b9
+        }
c563b9
+
c563b9
+        start_main_loop();
c563b9
+
c563b9
+        pcmk_free_ipc_api(controld_api);
c563b9
+    }
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+pcmk__designated_controller()
c563b9
+{
c563b9
+    pcmk_ipc_api_t *controld_api = ipc_connect(pcmk_ipc_controld, designated_controller_event_cb);
c563b9
+
c563b9
+    if (controld_api != NULL) {
c563b9
+        int rc = pcmk_controld_api_ping(controld_api, dest_node);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            exit_code = pcmk_rc2exitc(rc);
c563b9
+        }
c563b9
+
c563b9
+        start_main_loop();
c563b9
+
c563b9
+        pcmk_free_ipc_api(controld_api);
c563b9
+    }
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+pcmk__pacemakerd_status()
c563b9
+{
c563b9
+    pcmk_ipc_api_t *pacemakerd_api = ipc_connect(pcmk_ipc_pacemakerd, pacemakerd_event_cb);
c563b9
+
c563b9
+    if (pacemakerd_api != NULL) {
c563b9
+        int rc = pcmk_pacemakerd_api_ping(pacemakerd_api, ipc_name);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            exit_code = pcmk_rc2exitc(rc);
c563b9
+        }
c563b9
+
c563b9
+        start_main_loop();
c563b9
+
c563b9
+        pcmk_free_ipc_api(pacemakerd_api);
c563b9
+    }
c563b9
 }
c563b9
 
c563b9
 // \return Standard Pacemaker return code
c563b9
 static int
c563b9
-list_nodes()
c563b9
+pcmk__list_nodes()
c563b9
 {
c563b9
     cib_t *the_cib = cib_new();
c563b9
     xmlNode *output = NULL;
c563b9
@@ -565,7 +661,6 @@ main(int argc, char **argv)
c563b9
     int argerr = 0;
c563b9
     int rc;
c563b9
     pcmk_ipc_api_t *controld_api = NULL;
c563b9
-    pcmk_ipc_api_t *pacemakerd_api = NULL;
c563b9
 
c563b9
     pcmk__common_args_t *args = pcmk__new_common_args(SUMMARY);
c563b9
 
c563b9
@@ -643,51 +738,45 @@ main(int argc, char **argv)
c563b9
         goto done;
c563b9
     }
c563b9
 
c563b9
-    // Connect to the controller if needed
c563b9
-    if (need_controld_api) {
c563b9
-        rc = pcmk_new_ipc_api(&controld_api, pcmk_ipc_controld);
c563b9
-        if (controld_api == NULL) {
c563b9
-            out->err(out, "error: Could not connect to controller: %s",
c563b9
-                    pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
-            goto done;
c563b9
-        }
c563b9
-        pcmk_register_ipc_callback(controld_api, controller_event_cb, NULL);
c563b9
-        rc = pcmk_connect_ipc(controld_api, pcmk_ipc_dispatch_main);
c563b9
-        if (rc != pcmk_rc_ok) {
c563b9
-            out->err(out, "error: Could not connect to controller: %s",
c563b9
-                    pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
+    switch (command) {
c563b9
+        case cmd_health:
c563b9
+            pcmk__controller_status();
c563b9
             goto done;
c563b9
-        }
c563b9
-    }
c563b9
-
c563b9
-    // Connect to pacemakerd if needed
c563b9
-    if (need_pacemakerd_api) {
c563b9
-        rc = pcmk_new_ipc_api(&pacemakerd_api, pcmk_ipc_pacemakerd);
c563b9
-        if (pacemakerd_api == NULL) {
c563b9
-            out->err(out, "error: Could not connect to pacemakerd: %s",
c563b9
-                    pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
+        case cmd_pacemakerd_health:
c563b9
+            pcmk__pacemakerd_status();
c563b9
             goto done;
c563b9
-        }
c563b9
-        pcmk_register_ipc_callback(pacemakerd_api, pacemakerd_event_cb, NULL);
c563b9
-        rc = pcmk_connect_ipc(pacemakerd_api, pcmk_ipc_dispatch_main);
c563b9
-        if (rc != pcmk_rc_ok) {
c563b9
-            out->err(out, "error: Could not connect to pacemakerd: %s",
c563b9
-                    pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
+        case cmd_list_nodes:
c563b9
+            rc = pcmk__list_nodes();
c563b9
+            // might need movink
c563b9
+            if (rc != pcmk_rc_ok) {
c563b9
+                out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+                exit_code = pcmk_rc2exitc(rc);
c563b9
+            }
c563b9
+            break;
c563b9
+        case cmd_whois_dc:
c563b9
+            pcmk__designated_controller();
c563b9
             goto done;
c563b9
-        }
c563b9
+        default:
c563b9
+            rc = pcmk_new_ipc_api(&controld_api, pcmk_ipc_controld);
c563b9
+            if (controld_api == NULL) {
c563b9
+                out->err(out, "error: Could not connect to controller: %s",
c563b9
+                        pcmk_rc_str(rc));
c563b9
+                exit_code = pcmk_rc2exitc(rc);
c563b9
+                goto done;
c563b9
+            }
c563b9
+            rc = pcmk_connect_ipc(controld_api, pcmk_ipc_dispatch_main);
c563b9
+            if (rc != pcmk_rc_ok) {
c563b9
+                out->err(out, "error: Could not connect to controller: %s",
c563b9
+                        pcmk_rc_str(rc));
c563b9
+                exit_code = pcmk_rc2exitc(rc);
c563b9
+                goto done;
c563b9
+            }
c563b9
+            break;
c563b9
     }
c563b9
 
c563b9
-    if (do_work(controld_api?controld_api:pacemakerd_api)) {
c563b9
+    if (do_work(controld_api?controld_api:NULL)) {
c563b9
         // A reply is needed from controller, so run main loop to get it
c563b9
-        exit_code = CRM_EX_DISCONNECT; // For unexpected disconnects
c563b9
-        mainloop = g_main_loop_new(NULL, FALSE);
c563b9
-        message_timer_id = g_timeout_add(message_timeout_ms,
c563b9
-                                         admin_message_timeout, NULL);
c563b9
-        g_main_loop_run(mainloop);
c563b9
+        start_main_loop();
c563b9
     }
c563b9
 
c563b9
 done:
c563b9
@@ -698,12 +787,6 @@ done:
c563b9
         pcmk_free_ipc_api(capi);
c563b9
     }
c563b9
 
c563b9
-    if (pacemakerd_api != NULL) {
c563b9
-        pcmk_ipc_api_t *capi = pacemakerd_api;
c563b9
-        pacemakerd_api = NULL; // Ensure we can't free this twice
c563b9
-        pcmk_free_ipc_api(capi);
c563b9
-    }
c563b9
-
c563b9
     if (mainloop != NULL) {
c563b9
         g_main_loop_unref(mainloop);
c563b9
         mainloop = NULL;
c563b9
@@ -731,26 +814,14 @@ do_work(pcmk_ipc_api_t *api)
c563b9
             rc = pcmk_controld_api_shutdown(api, dest_node);
c563b9
             break;
c563b9
 
c563b9
-        case cmd_health:    // dest_node != NULL
c563b9
-        case cmd_whois_dc:  // dest_node == NULL
c563b9
-            rc = pcmk_controld_api_ping(api, dest_node);
c563b9
-            need_reply = true;
c563b9
-            break;
c563b9
-
c563b9
         case cmd_elect_dc:
c563b9
             rc = pcmk_controld_api_start_election(api);
c563b9
             break;
c563b9
 
c563b9
-        case cmd_list_nodes:
c563b9
-            rc = list_nodes();
c563b9
-            break;
c563b9
-
c563b9
-        case cmd_pacemakerd_health:
c563b9
-            rc = pcmk_pacemakerd_api_ping(api, ipc_name);
c563b9
-            need_reply = true;
c563b9
+        case cmd_none: // not actually possible here
c563b9
             break;
c563b9
 
c563b9
-        case cmd_none: // not actually possible here
c563b9
+        default:
c563b9
             break;
c563b9
     }
c563b9
     if (rc != pcmk_rc_ok) {
c563b9
-- 
c563b9
1.8.3.1
c563b9
c563b9
c563b9
From ac241aec979938175103624f07c8e90c6b550c48 Mon Sep 17 00:00:00 2001
c563b9
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
c563b9
Date: Fri, 30 Oct 2020 13:09:48 +0100
c563b9
Subject: [PATCH 2/2] Refactor: crmadmin: move guts to libpacemaker
c563b9
c563b9
---
c563b9
 include/pacemaker-internal.h          |   1 +
c563b9
 include/pcmki/Makefile.am             |   1 +
c563b9
 include/pcmki/pcmki_cluster_queries.h |  15 +
c563b9
 lib/pacemaker/Makefile.am             |   1 +
c563b9
 lib/pacemaker/pcmk_cluster_queries.c  | 408 +++++++++++++++++++++++
c563b9
 lib/pacemaker/pcmk_output.c           | 177 ++++++++++
c563b9
 tools/Makefile.am                     |   3 +-
c563b9
 tools/crmadmin.c                      | 612 ++--------------------------------
c563b9
 8 files changed, 642 insertions(+), 576 deletions(-)
c563b9
 create mode 100644 include/pcmki/pcmki_cluster_queries.h
c563b9
 create mode 100644 lib/pacemaker/pcmk_cluster_queries.c
c563b9
c563b9
diff --git a/include/pacemaker-internal.h b/include/pacemaker-internal.h
c563b9
index 37399e7..2e75d09 100644
c563b9
--- a/include/pacemaker-internal.h
c563b9
+++ b/include/pacemaker-internal.h
c563b9
@@ -11,6 +11,7 @@
c563b9
 #  define PACEMAKER_INTERNAL__H
c563b9
 
c563b9
 #  include <pcmki/pcmki_error.h>
c563b9
+#  include <pcmki/pcmki_cluster_queries.h>
c563b9
 #  include <pcmki/pcmki_fence.h>
c563b9
 #  include <pcmki/pcmki_output.h>
c563b9
 #  include <pcmki/pcmki_sched_allocate.h>
c563b9
diff --git a/include/pcmki/Makefile.am b/include/pcmki/Makefile.am
c563b9
index 647f2dc..7aa64c7 100644
c563b9
--- a/include/pcmki/Makefile.am
c563b9
+++ b/include/pcmki/Makefile.am
c563b9
@@ -10,6 +10,7 @@
c563b9
 MAINTAINERCLEANFILES    = Makefile.in
c563b9
 
c563b9
 noinst_HEADERS		= pcmki_error.h \
c563b9
+			  pcmki_cluster_queries.h \
c563b9
 			  pcmki_fence.h \
c563b9
 			  pcmki_output.h \
c563b9
 			  pcmki_sched_allocate.h \
c563b9
diff --git a/include/pcmki/pcmki_cluster_queries.h b/include/pcmki/pcmki_cluster_queries.h
c563b9
new file mode 100644
c563b9
index 0000000..eb3b51c
c563b9
--- /dev/null
c563b9
+++ b/include/pcmki/pcmki_cluster_queries.h
c563b9
@@ -0,0 +1,15 @@
c563b9
+#include <glib.h>               // gboolean, GMainLoop, etc.
c563b9
+
c563b9
+#include <crm/crm.h>
c563b9
+#include <crm/common/output_internal.h>
c563b9
+#include <crm/common/ipc_controld.h>
c563b9
+#include <crm/common/ipc_pacemakerd.h>
c563b9
+
c563b9
+int pcmk__controller_status(pcmk__output_t *out, char *dest_node, guint message_timeout_ms);
c563b9
+int pcmk__designated_controller(pcmk__output_t *out, guint message_timeout_ms);
c563b9
+int pcmk__pacemakerd_status(pcmk__output_t *out, char *ipc_name, guint message_timeout_ms);
c563b9
+int pcmk__list_nodes(pcmk__output_t *out, gboolean BASH_EXPORT);
c563b9
+
c563b9
+// remove when parameters removed from tools/crmadmin.c
c563b9
+int pcmk__shutdown_controller(pcmk__output_t *out, char *dest_node);
c563b9
+int pcmk__start_election(pcmk__output_t *out);
c563b9
diff --git a/lib/pacemaker/Makefile.am b/lib/pacemaker/Makefile.am
c563b9
index 51a811a..4129ade 100644
c563b9
--- a/lib/pacemaker/Makefile.am
c563b9
+++ b/lib/pacemaker/Makefile.am
c563b9
@@ -28,6 +28,7 @@ libpacemaker_la_LIBADD	= $(top_builddir)/lib/pengine/libpe_status.la \
c563b9
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
c563b9
 # Use += rather than backlashed continuation lines for parsing by bumplibs.sh
c563b9
 libpacemaker_la_SOURCES	=
c563b9
+libpacemaker_la_SOURCES += pcmk_cluster_queries.c
c563b9
 libpacemaker_la_SOURCES += pcmk_fence.c
c563b9
 libpacemaker_la_SOURCES += pcmk_output.c
c563b9
 libpacemaker_la_SOURCES	+= pcmk_sched_allocate.c
c563b9
diff --git a/lib/pacemaker/pcmk_cluster_queries.c b/lib/pacemaker/pcmk_cluster_queries.c
c563b9
new file mode 100644
c563b9
index 0000000..8d729eb
c563b9
--- /dev/null
c563b9
+++ b/lib/pacemaker/pcmk_cluster_queries.c
c563b9
@@ -0,0 +1,408 @@
c563b9
+#include <glib.h>               // gboolean, GMainLoop, etc.
c563b9
+#include <libxml/tree.h>        // xmlNode
c563b9
+
c563b9
+#include <pacemaker-internal.h>
c563b9
+
c563b9
+#include <crm/crm.h>
c563b9
+#include <crm/cib.h>
c563b9
+#include <crm/msg_xml.h>
c563b9
+#include <crm/common/output_internal.h>
c563b9
+#include <crm/common/xml.h>
c563b9
+#include <crm/common/iso8601.h>
c563b9
+#include <crm/common/ipc_controld.h>
c563b9
+#include <crm/common/ipc_pacemakerd.h>
c563b9
+#include <crm/common/mainloop.h>
c563b9
+
c563b9
+#define DEFAULT_MESSAGE_TIMEOUT_MS 30000
c563b9
+
c563b9
+
c563b9
+typedef struct {
c563b9
+    pcmk__output_t *out;
c563b9
+    GMainLoop *mainloop;
c563b9
+    int rc;
c563b9
+    guint message_timer_id;
c563b9
+    guint message_timeout_ms;
c563b9
+} data_t;
c563b9
+
c563b9
+static void
c563b9
+quit_main_loop(data_t *data)
c563b9
+{
c563b9
+    if (data->mainloop != NULL) {
c563b9
+        GMainLoop *mloop = data->mainloop;
c563b9
+
c563b9
+        data->mainloop = NULL; // Don't re-enter this block
c563b9
+        pcmk_quit_main_loop(mloop, 10);
c563b9
+        g_main_loop_unref(mloop);
c563b9
+    }
c563b9
+}
c563b9
+
c563b9
+static gboolean
c563b9
+admin_message_timeout(gpointer user_data)
c563b9
+{
c563b9
+    data_t *data = user_data;
c563b9
+    pcmk__output_t *out = data->out;
c563b9
+
c563b9
+    out->err(out, "error: No reply received from controller before timeout (%dms)",
c563b9
+            data->message_timeout_ms);
c563b9
+    data->message_timer_id = 0;
c563b9
+    data->rc = ETIMEDOUT;
c563b9
+    quit_main_loop(data);
c563b9
+    return FALSE; // Tells glib to remove source
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+start_main_loop(data_t *data)
c563b9
+{
c563b9
+    if (data->message_timeout_ms < 1) {
c563b9
+        data->message_timeout_ms = DEFAULT_MESSAGE_TIMEOUT_MS;
c563b9
+    }
c563b9
+
c563b9
+    data->rc = ECONNRESET; // For unexpected disconnects
c563b9
+    data->mainloop = g_main_loop_new(NULL, FALSE);
c563b9
+    data->message_timer_id = g_timeout_add(data->message_timeout_ms,
c563b9
+                                     admin_message_timeout,
c563b9
+                                     data);
c563b9
+    g_main_loop_run(data->mainloop);
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+event_done(data_t *data, pcmk_ipc_api_t *api)
c563b9
+{
c563b9
+    pcmk_disconnect_ipc(api);
c563b9
+    quit_main_loop(data);
c563b9
+}
c563b9
+
c563b9
+static pcmk_controld_api_reply_t *
c563b9
+controld_event_reply(data_t *data, pcmk_ipc_api_t *controld_api, enum pcmk_ipc_event event_type, crm_exit_t status, void *event_data)
c563b9
+{
c563b9
+    pcmk__output_t *out = data->out;
c563b9
+    pcmk_controld_api_reply_t *reply = event_data;
c563b9
+
c563b9
+    switch (event_type) {
c563b9
+        case pcmk_ipc_event_disconnect:
c563b9
+            if (data->rc == ECONNRESET) { // Unexpected
c563b9
+                out->err(out, "error: Lost connection to controller");
c563b9
+            }
c563b9
+            event_done(data, controld_api);
c563b9
+            return NULL;
c563b9
+
c563b9
+        case pcmk_ipc_event_reply:
c563b9
+            break;
c563b9
+
c563b9
+        default:
c563b9
+            return NULL;
c563b9
+    }
c563b9
+
c563b9
+    if (data->message_timer_id != 0) {
c563b9
+        g_source_remove(data->message_timer_id);
c563b9
+        data->message_timer_id = 0;
c563b9
+    }
c563b9
+
c563b9
+    if (status != CRM_EX_OK) {
c563b9
+        out->err(out, "error: Bad reply from controller: %s",
c563b9
+                crm_exit_str(status));
c563b9
+        data->rc = EBADMSG;
c563b9
+        event_done(data, controld_api);
c563b9
+        return NULL;
c563b9
+    }
c563b9
+
c563b9
+    if (reply->reply_type != pcmk_controld_reply_ping) {
c563b9
+        out->err(out, "error: Unknown reply type %d from controller",
c563b9
+                reply->reply_type);
c563b9
+        data->rc = EBADMSG;
c563b9
+        event_done(data, controld_api);
c563b9
+        return NULL;
c563b9
+    }
c563b9
+
c563b9
+    return reply;
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+controller_status_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
+                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
+                    void *event_data, void *user_data)
c563b9
+{
c563b9
+    data_t *data = user_data;
c563b9
+    pcmk__output_t *out = data->out;
c563b9
+    pcmk_controld_api_reply_t *reply = controld_event_reply(data, controld_api,
c563b9
+        event_type, status, event_data);
c563b9
+
c563b9
+    if (reply != NULL) {
c563b9
+        out->message(out, "health",
c563b9
+               reply->data.ping.sys_from,
c563b9
+               reply->host_from,
c563b9
+               reply->data.ping.fsa_state,
c563b9
+               reply->data.ping.result);
c563b9
+        data->rc = pcmk_rc_ok;
c563b9
+    }
c563b9
+
c563b9
+    event_done(data, controld_api);
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+designated_controller_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
+                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
+                    void *event_data, void *user_data)
c563b9
+{
c563b9
+    data_t *data = user_data;
c563b9
+    pcmk__output_t *out = data->out;
c563b9
+    pcmk_controld_api_reply_t *reply = controld_event_reply(data, controld_api,
c563b9
+        event_type, status, event_data);
c563b9
+
c563b9
+    if (reply != NULL) {
c563b9
+        out->message(out, "dc", reply->host_from);
c563b9
+        data->rc = pcmk_rc_ok;
c563b9
+    }
c563b9
+
c563b9
+    event_done(data, controld_api);
c563b9
+}
c563b9
+
c563b9
+static void
c563b9
+pacemakerd_event_cb(pcmk_ipc_api_t *pacemakerd_api,
c563b9
+                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
+                    void *event_data, void *user_data)
c563b9
+{
c563b9
+    data_t *data = user_data;
c563b9
+    pcmk__output_t *out = data->out;
c563b9
+    pcmk_pacemakerd_api_reply_t *reply = event_data;
c563b9
+
c563b9
+    crm_time_t *crm_when;
c563b9
+    char *pinged_buf = NULL;
c563b9
+
c563b9
+    switch (event_type) {
c563b9
+        case pcmk_ipc_event_disconnect:
c563b9
+            if (data->rc == ECONNRESET) { // Unexpected
c563b9
+                out->err(out, "error: Lost connection to pacemakerd");
c563b9
+            }
c563b9
+            event_done(data, pacemakerd_api);
c563b9
+            return;
c563b9
+
c563b9
+        case pcmk_ipc_event_reply:
c563b9
+            break;
c563b9
+
c563b9
+        default:
c563b9
+            return;
c563b9
+    }
c563b9
+
c563b9
+    if (data->message_timer_id != 0) {
c563b9
+        g_source_remove(data->message_timer_id);
c563b9
+        data->message_timer_id = 0;
c563b9
+    }
c563b9
+
c563b9
+    if (status != CRM_EX_OK) {
c563b9
+        out->err(out, "error: Bad reply from pacemakerd: %s",
c563b9
+                crm_exit_str(status));
c563b9
+        event_done(data, pacemakerd_api);
c563b9
+        return;
c563b9
+    }
c563b9
+
c563b9
+    if (reply->reply_type != pcmk_pacemakerd_reply_ping) {
c563b9
+        out->err(out, "error: Unknown reply type %d from pacemakerd",
c563b9
+                reply->reply_type);
c563b9
+        event_done(data, pacemakerd_api);
c563b9
+        return;
c563b9
+    }
c563b9
+
c563b9
+    // Parse desired information from reply
c563b9
+    crm_when = crm_time_new(NULL);
c563b9
+    crm_time_set_timet(crm_when, &reply->data.ping.last_good);
c563b9
+    pinged_buf = crm_time_as_string(crm_when,
c563b9
+        crm_time_log_date | crm_time_log_timeofday |
c563b9
+            crm_time_log_with_timezone);
c563b9
+
c563b9
+    out->message(out, "pacemakerd-health",
c563b9
+        reply->data.ping.sys_from,
c563b9
+        (reply->data.ping.status == pcmk_rc_ok)?
c563b9
+            pcmk_pacemakerd_api_daemon_state_enum2text(
c563b9
+                reply->data.ping.state):"query failed",
c563b9
+        (reply->data.ping.status == pcmk_rc_ok)?pinged_buf:"");
c563b9
+    data->rc = pcmk_rc_ok;
c563b9
+    crm_time_free(crm_when);
c563b9
+    free(pinged_buf);
c563b9
+
c563b9
+    event_done(data, pacemakerd_api);
c563b9
+}
c563b9
+
c563b9
+static pcmk_ipc_api_t *
c563b9
+ipc_connect(data_t *data, enum pcmk_ipc_server server, pcmk_ipc_callback_t cb)
c563b9
+{
c563b9
+    int rc;
c563b9
+    pcmk__output_t *out = data->out;
c563b9
+    pcmk_ipc_api_t *api = NULL;
c563b9
+
c563b9
+
c563b9
+    rc = pcmk_new_ipc_api(&api, server);
c563b9
+    if (api == NULL) {
c563b9
+        out->err(out, "error: Could not connect to %s: %s",
c563b9
+                pcmk_ipc_name(api, true),
c563b9
+                pcmk_rc_str(rc));
c563b9
+        data->rc = rc;
c563b9
+        return NULL;
c563b9
+    }
c563b9
+    if (cb != NULL) {
c563b9
+        pcmk_register_ipc_callback(api, cb, data);
c563b9
+    }
c563b9
+    rc = pcmk_connect_ipc(api, pcmk_ipc_dispatch_main);
c563b9
+    if (rc != pcmk_rc_ok) {
c563b9
+        out->err(out, "error: Could not connect to %s: %s",
c563b9
+                pcmk_ipc_name(api, true),
c563b9
+                pcmk_rc_str(rc));
c563b9
+        data->rc = rc;
c563b9
+        return NULL;
c563b9
+    }
c563b9
+
c563b9
+    return api;
c563b9
+}
c563b9
+
c563b9
+int
c563b9
+pcmk__controller_status(pcmk__output_t *out, char *dest_node, guint message_timeout_ms)
c563b9
+{
c563b9
+    data_t data = {
c563b9
+        .out = out,
c563b9
+        .mainloop = NULL,
c563b9
+        .rc = pcmk_rc_ok,
c563b9
+        .message_timer_id = 0,
c563b9
+        .message_timeout_ms = message_timeout_ms
c563b9
+    };
c563b9
+    pcmk_ipc_api_t *controld_api = ipc_connect(&data, pcmk_ipc_controld, controller_status_event_cb);
c563b9
+
c563b9
+    if (controld_api != NULL) {
c563b9
+        int rc = pcmk_controld_api_ping(controld_api, dest_node);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            data.rc = rc;
c563b9
+        }
c563b9
+
c563b9
+        start_main_loop(&data);
c563b9
+
c563b9
+        pcmk_free_ipc_api(controld_api);
c563b9
+    }
c563b9
+
c563b9
+    return data.rc;
c563b9
+}
c563b9
+
c563b9
+int
c563b9
+pcmk__designated_controller(pcmk__output_t *out, guint message_timeout_ms)
c563b9
+{
c563b9
+    data_t data = {
c563b9
+        .out = out,
c563b9
+        .mainloop = NULL,
c563b9
+        .rc = pcmk_rc_ok,
c563b9
+        .message_timer_id = 0,
c563b9
+        .message_timeout_ms = message_timeout_ms
c563b9
+    };
c563b9
+    pcmk_ipc_api_t *controld_api = ipc_connect(&data, pcmk_ipc_controld, designated_controller_event_cb);
c563b9
+
c563b9
+    if (controld_api != NULL) {
c563b9
+        int rc = pcmk_controld_api_ping(controld_api, NULL);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            data.rc = rc;
c563b9
+        }
c563b9
+
c563b9
+        start_main_loop(&data);
c563b9
+
c563b9
+        pcmk_free_ipc_api(controld_api);
c563b9
+    }
c563b9
+
c563b9
+    return data.rc;
c563b9
+}
c563b9
+
c563b9
+int
c563b9
+pcmk__pacemakerd_status(pcmk__output_t *out, char *ipc_name, guint message_timeout_ms)
c563b9
+{
c563b9
+    data_t data = {
c563b9
+        .out = out,
c563b9
+        .mainloop = NULL,
c563b9
+        .rc = pcmk_rc_ok,
c563b9
+        .message_timer_id = 0,
c563b9
+        .message_timeout_ms = message_timeout_ms
c563b9
+    };
c563b9
+    pcmk_ipc_api_t *pacemakerd_api = ipc_connect(&data, pcmk_ipc_pacemakerd, pacemakerd_event_cb);
c563b9
+
c563b9
+    if (pacemakerd_api != NULL) {
c563b9
+        int rc = pcmk_pacemakerd_api_ping(pacemakerd_api, ipc_name);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            data.rc = rc;
c563b9
+        }
c563b9
+
c563b9
+        start_main_loop(&data);
c563b9
+
c563b9
+        pcmk_free_ipc_api(pacemakerd_api);
c563b9
+    }
c563b9
+
c563b9
+    return data.rc;
c563b9
+}
c563b9
+
c563b9
+// \return Standard Pacemaker return code
c563b9
+int
c563b9
+pcmk__list_nodes(pcmk__output_t *out, gboolean BASH_EXPORT)
c563b9
+{
c563b9
+    cib_t *the_cib = cib_new();
c563b9
+    xmlNode *output = NULL;
c563b9
+    int rc;
c563b9
+
c563b9
+    if (the_cib == NULL) {
c563b9
+        return ENOMEM;
c563b9
+    }
c563b9
+    rc = the_cib->cmds->signon(the_cib, crm_system_name, cib_command);
c563b9
+    if (rc != pcmk_ok) {
c563b9
+        return pcmk_legacy2rc(rc);
c563b9
+    }
c563b9
+
c563b9
+    rc = the_cib->cmds->query(the_cib, NULL, &output,
c563b9
+                              cib_scope_local | cib_sync_call);
c563b9
+    if (rc == pcmk_ok) {
c563b9
+        out->message(out, "crmadmin-node-list", output, BASH_EXPORT);
c563b9
+        free_xml(output);
c563b9
+    }
c563b9
+    the_cib->cmds->signoff(the_cib);
c563b9
+    return pcmk_legacy2rc(rc);
c563b9
+}
c563b9
+
c563b9
+// remove when parameters removed from tools/crmadmin.c
c563b9
+int
c563b9
+pcmk__shutdown_controller(pcmk__output_t *out, char *dest_node)
c563b9
+{
c563b9
+    data_t data = {
c563b9
+        .out = out,
c563b9
+        .mainloop = NULL,
c563b9
+        .rc = pcmk_rc_ok,
c563b9
+    };
c563b9
+    pcmk_ipc_api_t *controld_api = ipc_connect(&data, pcmk_ipc_controld, NULL);
c563b9
+
c563b9
+    if (controld_api != NULL) {
c563b9
+        int rc = pcmk_controld_api_shutdown(controld_api, dest_node);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            data.rc = rc;
c563b9
+        }
c563b9
+        pcmk_free_ipc_api(controld_api);
c563b9
+    }
c563b9
+
c563b9
+    return data.rc;
c563b9
+}
c563b9
+
c563b9
+int
c563b9
+pcmk__start_election(pcmk__output_t *out)
c563b9
+{
c563b9
+    data_t data = {
c563b9
+        .out = out,
c563b9
+        .mainloop = NULL,
c563b9
+        .rc = pcmk_rc_ok,
c563b9
+    };
c563b9
+    pcmk_ipc_api_t *controld_api = ipc_connect(&data, pcmk_ipc_controld, NULL);
c563b9
+
c563b9
+    if (controld_api != NULL) {
c563b9
+        int rc = pcmk_controld_api_start_election(controld_api);
c563b9
+        if (rc != pcmk_rc_ok) {
c563b9
+            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+            data.rc = rc;
c563b9
+        }
c563b9
+
c563b9
+        pcmk_free_ipc_api(controld_api);
c563b9
+    }
c563b9
+
c563b9
+    return data.rc;
c563b9
+}
c563b9
diff --git a/lib/pacemaker/pcmk_output.c b/lib/pacemaker/pcmk_output.c
c563b9
index 306e561..fd577c6 100644
c563b9
--- a/lib/pacemaker/pcmk_output.c
c563b9
+++ b/lib/pacemaker/pcmk_output.c
c563b9
@@ -357,6 +357,174 @@ stacks_and_constraints_xml(pcmk__output_t *out, va_list args) {
c563b9
     return pcmk_rc_ok;
c563b9
 }
c563b9
 
c563b9
+PCMK__OUTPUT_ARGS("health", "char *", "char *", "char *", "char *")
c563b9
+static int
c563b9
+health_text(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *sys_from = va_arg(args, char *);
c563b9
+    char *host_from = va_arg(args, char *);
c563b9
+    char *fsa_state = va_arg(args, char *);
c563b9
+    char *result = va_arg(args, char *);
c563b9
+
c563b9
+    if (!out->is_quiet(out)) {
c563b9
+        out->info(out, "Status of %s@%s: %s (%s)", crm_str(sys_from),
c563b9
+                       crm_str(host_from), crm_str(fsa_state), crm_str(result));
c563b9
+    } else if (fsa_state != NULL) {
c563b9
+        out->info(out, "%s", fsa_state);
c563b9
+    }
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("health", "char *", "char *", "char *", "char *")
c563b9
+static int
c563b9
+health_xml(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *sys_from = va_arg(args, char *);
c563b9
+    char *host_from = va_arg(args, char *);
c563b9
+    char *fsa_state = va_arg(args, char *);
c563b9
+    char *result = va_arg(args, char *);
c563b9
+
c563b9
+    xmlNodePtr node = pcmk__output_create_xml_node(out, crm_str(sys_from));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "node_name", (pcmkXmlStr) crm_str(host_from));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "state", (pcmkXmlStr) crm_str(fsa_state));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "result", (pcmkXmlStr) crm_str(result));
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("pacemakerd-health", "char *", "char *", "char *")
c563b9
+static int
c563b9
+pacemakerd_health_text(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *sys_from = va_arg(args, char *);
c563b9
+    char *state = va_arg(args, char *);
c563b9
+    char *last_updated = va_arg(args, char *);
c563b9
+
c563b9
+    if (!out->is_quiet(out)) {
c563b9
+        out->info(out, "Status of %s: '%s' %s %s", crm_str(sys_from),
c563b9
+                  crm_str(state), (!pcmk__str_empty(last_updated))?
c563b9
+                  "last updated":"", crm_str(last_updated));
c563b9
+    } else {
c563b9
+        out->info(out, "%s", crm_str(state));
c563b9
+    }
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("pacemakerd-health", "char *", "char *", "char *")
c563b9
+static int
c563b9
+pacemakerd_health_xml(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *sys_from = va_arg(args, char *);
c563b9
+    char *state = va_arg(args, char *);
c563b9
+    char *last_updated = va_arg(args, char *);
c563b9
+
c563b9
+
c563b9
+    xmlNodePtr node = pcmk__output_create_xml_node(out, crm_str(sys_from));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "state", (pcmkXmlStr) crm_str(state));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "last_updated", (pcmkXmlStr) crm_str(last_updated));
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("dc", "char *")
c563b9
+static int
c563b9
+dc_text(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *dc = va_arg(args, char *);
c563b9
+
c563b9
+    if (!out->is_quiet(out)) {
c563b9
+        out->info(out, "Designated Controller is: %s", crm_str(dc));
c563b9
+    } else if (dc != NULL) {
c563b9
+        out->info(out, "%s", dc);
c563b9
+    }
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("dc", "char *")
c563b9
+static int
c563b9
+dc_xml(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *dc = va_arg(args, char *);
c563b9
+
c563b9
+    xmlNodePtr node = pcmk__output_create_xml_node(out, "dc");
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "node_name", (pcmkXmlStr) crm_str(dc));
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("crmadmin-node-list", "pcmk__output_t *", "xmlNode *")
c563b9
+static int
c563b9
+crmadmin_node_list(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    xmlNode *xml_node = va_arg(args, xmlNode *);
c563b9
+    int found = 0;
c563b9
+    xmlNode *node = NULL;
c563b9
+    xmlNode *nodes = get_object_root(XML_CIB_TAG_NODES, xml_node);
c563b9
+    gboolean BASH_EXPORT = va_arg(args, gboolean);
c563b9
+
c563b9
+    out->begin_list(out, NULL, NULL, "nodes");
c563b9
+
c563b9
+    for (node = first_named_child(nodes, XML_CIB_TAG_NODE); node != NULL;
c563b9
+         node = crm_next_same_xml(node)) {
c563b9
+        const char *node_type = BASH_EXPORT ? NULL :
c563b9
+                     crm_element_value(node, XML_ATTR_TYPE);
c563b9
+        out->message(out, "crmadmin-node", node_type,
c563b9
+                     crm_str(crm_element_value(node, XML_ATTR_UNAME)),
c563b9
+                     crm_str(crm_element_value(node, XML_ATTR_ID)),
c563b9
+                     BASH_EXPORT);
c563b9
+
c563b9
+        found++;
c563b9
+    }
c563b9
+    // @TODO List Pacemaker Remote nodes that don't have a <node> entry
c563b9
+
c563b9
+    out->end_list(out);
c563b9
+
c563b9
+    if (found == 0) {
c563b9
+        out->info(out, "No nodes configured");
c563b9
+    }
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("crmadmin-node", "char *", "char *", "char *", "gboolean")
c563b9
+static int
c563b9
+crmadmin_node_text(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *type = va_arg(args, char *);
c563b9
+    char *name = va_arg(args, char *);
c563b9
+    char *id = va_arg(args, char *);
c563b9
+    gboolean BASH_EXPORT = va_arg(args, gboolean);
c563b9
+
c563b9
+    if (BASH_EXPORT) {
c563b9
+        out->info(out, "export %s=%s", crm_str(name), crm_str(id));
c563b9
+    } else {
c563b9
+        out->info(out, "%s node: %s (%s)", type ? type : "member",
c563b9
+                  crm_str(name), crm_str(id));
c563b9
+    }
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
+PCMK__OUTPUT_ARGS("crmadmin-node", "char *", "char *", "char *", "gboolean")
c563b9
+static int
c563b9
+crmadmin_node_xml(pcmk__output_t *out, va_list args)
c563b9
+{
c563b9
+    char *type = va_arg(args, char *);
c563b9
+    char *name = va_arg(args, char *);
c563b9
+    char *id = va_arg(args, char *);
c563b9
+
c563b9
+    xmlNodePtr node = pcmk__output_create_xml_node(out, "node");
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "type", (pcmkXmlStr) (type ? type : "member"));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "name", (pcmkXmlStr) crm_str(name));
c563b9
+    xmlSetProp(node, (pcmkXmlStr) "id", (pcmkXmlStr) crm_str(id));
c563b9
+
c563b9
+    return pcmk_rc_ok;
c563b9
+}
c563b9
+
c563b9
 static pcmk__message_entry_t fmt_functions[] = {
c563b9
     { "colocations-list", "default", colocations_list },
c563b9
     { "colocations-list", "xml", colocations_list_xml },
c563b9
@@ -364,6 +532,15 @@ static pcmk__message_entry_t fmt_functions[] = {
c563b9
     { "locations-list", "xml", locations_list_xml },
c563b9
     { "stacks-constraints", "default", stacks_and_constraints },
c563b9
     { "stacks-constraints", "xml", stacks_and_constraints_xml },
c563b9
+    { "health", "default", health_text },
c563b9
+    { "health", "xml", health_xml },
c563b9
+    { "pacemakerd-health", "default", pacemakerd_health_text },
c563b9
+    { "pacemakerd-health", "xml", pacemakerd_health_xml },
c563b9
+    { "dc", "default", dc_text },
c563b9
+    { "dc", "xml", dc_xml },
c563b9
+    { "crmadmin-node-list", "default", crmadmin_node_list },
c563b9
+    { "crmadmin-node", "default", crmadmin_node_text },
c563b9
+    { "crmadmin-node", "xml", crmadmin_node_xml },
c563b9
 
c563b9
     { NULL, NULL, NULL }
c563b9
 };
c563b9
diff --git a/tools/Makefile.am b/tools/Makefile.am
c563b9
index a278fa3..de64c93 100644
c563b9
--- a/tools/Makefile.am
c563b9
+++ b/tools/Makefile.am
c563b9
@@ -69,7 +69,8 @@ MAN8DEPS		= crm_attribute
c563b9
 crmadmin_SOURCES	= crmadmin.c
c563b9
 crmadmin_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la	\
c563b9
 			  $(top_builddir)/lib/cib/libcib.la		\
c563b9
-			  $(top_builddir)/lib/common/libcrmcommon.la
c563b9
+			  $(top_builddir)/lib/common/libcrmcommon.la	\
c563b9
+			  $(top_builddir)/lib/pacemaker/libpacemaker.la
c563b9
 
c563b9
 crm_error_SOURCES	= crm_error.c
c563b9
 crm_error_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la
c563b9
diff --git a/tools/crmadmin.c b/tools/crmadmin.c
c563b9
index ec902df..2d9d663 100644
c563b9
--- a/tools/crmadmin.c
c563b9
+++ b/tools/crmadmin.c
c563b9
@@ -16,32 +16,13 @@
c563b9
 #include <glib.h>               // gboolean, GMainLoop, etc.
c563b9
 #include <libxml/tree.h>        // xmlNode
c563b9
 
c563b9
-#include <crm/crm.h>
c563b9
-#include <crm/cib.h>
c563b9
-#include <crm/msg_xml.h>
c563b9
+#include <pacemaker-internal.h>
c563b9
+
c563b9
 #include <crm/common/cmdline_internal.h>
c563b9
 #include <crm/common/output_internal.h>
c563b9
-#include <crm/common/xml.h>
c563b9
-#include <crm/common/iso8601.h>
c563b9
-#include <crm/common/ipc_controld.h>
c563b9
-#include <crm/common/ipc_pacemakerd.h>
c563b9
-#include <crm/common/mainloop.h>
c563b9
 
c563b9
 #define SUMMARY "query and manage the Pacemaker controller"
c563b9
 
c563b9
-#define DEFAULT_MESSAGE_TIMEOUT_MS 30000
c563b9
-
c563b9
-static guint message_timer_id = 0;
c563b9
-static guint message_timeout_ms = DEFAULT_MESSAGE_TIMEOUT_MS;
c563b9
-static GMainLoop *mainloop = NULL;
c563b9
-
c563b9
-bool need_controld_api = true;
c563b9
-
c563b9
-bool do_work(pcmk_ipc_api_t *api);
c563b9
-static char *ipc_name = NULL;
c563b9
-
c563b9
-gboolean admin_message_timeout(gpointer data);
c563b9
-
c563b9
 static enum {
c563b9
     cmd_none,
c563b9
     cmd_shutdown,
c563b9
@@ -52,17 +33,17 @@ static enum {
c563b9
     cmd_pacemakerd_health,
c563b9
 } command = cmd_none;
c563b9
 
c563b9
-static gboolean BE_VERBOSE = FALSE;
c563b9
-static gboolean BASH_EXPORT = FALSE;
c563b9
-static char *dest_node = NULL;
c563b9
-static crm_exit_t exit_code = CRM_EX_OK;
c563b9
-pcmk__output_t *out = NULL;
c563b9
-
c563b9
-
c563b9
 struct {
c563b9
     gboolean health;
c563b9
     gint timeout;
c563b9
-} options;
c563b9
+    char *dest_node;
c563b9
+    char *ipc_name;
c563b9
+    gboolean BASH_EXPORT;
c563b9
+} options = {
c563b9
+    .dest_node = NULL,
c563b9
+    .ipc_name = NULL,
c563b9
+    .BASH_EXPORT = FALSE
c563b9
+};
c563b9
 
c563b9
 gboolean command_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError **error);
c563b9
 
c563b9
@@ -112,11 +93,11 @@ static GOptionEntry additional_options[] = {
c563b9
       "\n                          operation failed",
c563b9
       NULL
c563b9
     },
c563b9
-    { "bash-export", 'B', 0, G_OPTION_ARG_NONE, &BASH_EXPORT,
c563b9
+    { "bash-export", 'B', 0, G_OPTION_ARG_NONE, &options.BASH_EXPORT,
c563b9
       "Display nodes as shell commands of the form 'export uname=uuid'"
c563b9
       "\n                          (valid with -N/--nodes)",
c563b9
     },
c563b9
-    { "ipc-name", 'i', 0, G_OPTION_ARG_STRING, &ipc_name,
c563b9
+    { "ipc-name", 'i', 0, G_OPTION_ARG_STRING, &options.ipc_name,
c563b9
       "Name to use for ipc instead of 'crmadmin' (with -P/--pacemakerd).",
c563b9
       NULL
c563b9
     },
c563b9
@@ -154,478 +135,21 @@ command_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError
c563b9
     }
c563b9
 
c563b9
     if (optarg) {
c563b9
-        if (dest_node != NULL) {
c563b9
-            free(dest_node);
c563b9
+        if (options.dest_node != NULL) {
c563b9
+            free(options.dest_node);
c563b9
         }
c563b9
-        dest_node = strdup(optarg);
c563b9
+        options.dest_node = strdup(optarg);
c563b9
     }
c563b9
 
c563b9
     return TRUE;
c563b9
 }
c563b9
 
c563b9
-PCMK__OUTPUT_ARGS("health", "const char *", "const char *", "const char *", "const char *")
c563b9
-static int
c563b9
-health_text(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *sys_from = va_arg(args, const char *);
c563b9
-    const char *host_from = va_arg(args, const char *);
c563b9
-    const char *fsa_state = va_arg(args, const char *);
c563b9
-    const char *result = va_arg(args, const char *);
c563b9
-
c563b9
-    if (!out->is_quiet(out)) {
c563b9
-        out->info(out, "Status of %s@%s: %s (%s)", crm_str(sys_from),
c563b9
-                       crm_str(host_from), crm_str(fsa_state), crm_str(result));
c563b9
-    } else if (fsa_state != NULL) {
c563b9
-        out->info(out, "%s", fsa_state);
c563b9
-    }
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("health", "const char *", "const char *", "const char *", "const char *")
c563b9
-static int
c563b9
-health_xml(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *sys_from = va_arg(args, const char *);
c563b9
-    const char *host_from = va_arg(args, const char *);
c563b9
-    const char *fsa_state = va_arg(args, const char *);
c563b9
-    const char *result = va_arg(args, const char *);
c563b9
-
c563b9
-    xmlNodePtr node = pcmk__output_create_xml_node(out, crm_str(sys_from));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "node_name", (pcmkXmlStr) crm_str(host_from));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "state", (pcmkXmlStr) crm_str(fsa_state));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "result", (pcmkXmlStr) crm_str(result));
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("pacemakerd-health", "const char *", "const char *", "const char *")
c563b9
-static int
c563b9
-pacemakerd_health_text(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *sys_from = va_arg(args, const char *);
c563b9
-    const char *state = va_arg(args, const char *);
c563b9
-    const char *last_updated = va_arg(args, const char *);
c563b9
-
c563b9
-    if (!out->is_quiet(out)) {
c563b9
-        out->info(out, "Status of %s: '%s' %s %s", crm_str(sys_from),
c563b9
-                  crm_str(state), (!pcmk__str_empty(last_updated))?
c563b9
-                  "last updated":"", crm_str(last_updated));
c563b9
-    } else {
c563b9
-        out->info(out, "%s", crm_str(state));
c563b9
-    }
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("pacemakerd-health", "const char *", "const char *", "const char *")
c563b9
-static int
c563b9
-pacemakerd_health_xml(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *sys_from = va_arg(args, const char *);
c563b9
-    const char *state = va_arg(args, const char *);
c563b9
-    const char *last_updated = va_arg(args, const char *);
c563b9
-
c563b9
-
c563b9
-    xmlNodePtr node = pcmk__output_create_xml_node(out, crm_str(sys_from));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "state", (pcmkXmlStr) crm_str(state));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "last_updated", (pcmkXmlStr) crm_str(last_updated));
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("dc", "const char *")
c563b9
-static int
c563b9
-dc_text(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *dc = va_arg(args, const char *);
c563b9
-
c563b9
-    if (!out->is_quiet(out)) {
c563b9
-        out->info(out, "Designated Controller is: %s", crm_str(dc));
c563b9
-    } else if (dc != NULL) {
c563b9
-        out->info(out, "%s", dc);
c563b9
-    }
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("dc", "const char *")
c563b9
-static int
c563b9
-dc_xml(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *dc = va_arg(args, const char *);
c563b9
-
c563b9
-    xmlNodePtr node = pcmk__output_create_xml_node(out, "dc");
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "node_name", (pcmkXmlStr) crm_str(dc));
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("crmadmin-node-list", "struct xmlNode *")
c563b9
-static int
c563b9
-crmadmin_node_list(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    xmlNode *xml_node = va_arg(args, xmlNode *);
c563b9
-    int found = 0;
c563b9
-    xmlNode *node = NULL;
c563b9
-    xmlNode *nodes = get_object_root(XML_CIB_TAG_NODES, xml_node);
c563b9
-
c563b9
-    out->begin_list(out, NULL, NULL, "nodes");
c563b9
-
c563b9
-    for (node = first_named_child(nodes, XML_CIB_TAG_NODE); node != NULL;
c563b9
-         node = crm_next_same_xml(node)) {
c563b9
-        const char *node_type = BASH_EXPORT ? NULL :
c563b9
-                     crm_element_value(node, XML_ATTR_TYPE);
c563b9
-        out->message(out, "crmadmin-node", node_type,
c563b9
-                     crm_str(crm_element_value(node, XML_ATTR_UNAME)),
c563b9
-                     crm_str(crm_element_value(node, XML_ATTR_ID)));
c563b9
-
c563b9
-        found++;
c563b9
-    }
c563b9
-    // @TODO List Pacemaker Remote nodes that don't have a <node> entry
c563b9
-
c563b9
-    out->end_list(out);
c563b9
-
c563b9
-    if (found == 0) {
c563b9
-        out->info(out, "No nodes configured");
c563b9
-    }
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("crmadmin-node", "const char *", "const char *", "const char *")
c563b9
-static int
c563b9
-crmadmin_node_text(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-        const char *type = va_arg(args, const char *);
c563b9
-        const char *name = va_arg(args, const char *);
c563b9
-        const char *id = va_arg(args, const char *);
c563b9
-
c563b9
-        if (BASH_EXPORT) {
c563b9
-            out->info(out, "export %s=%s", crm_str(name), crm_str(id));
c563b9
-        } else {
c563b9
-            out->info(out, "%s node: %s (%s)", type ? type : "member",
c563b9
-                      crm_str(name), crm_str(id));
c563b9
-        }
c563b9
-
c563b9
-        return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-PCMK__OUTPUT_ARGS("crmadmin-node", "const char *", "const char *", "const char *")
c563b9
-static int
c563b9
-crmadmin_node_xml(pcmk__output_t *out, va_list args)
c563b9
-{
c563b9
-    const char *type = va_arg(args, const char *);
c563b9
-    const char *name = va_arg(args, const char *);
c563b9
-    const char *id = va_arg(args, const char *);
c563b9
-
c563b9
-    xmlNodePtr node = pcmk__output_create_xml_node(out, "node");
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "type", (pcmkXmlStr) (type ? type : "member"));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "name", (pcmkXmlStr) crm_str(name));
c563b9
-    xmlSetProp(node, (pcmkXmlStr) "id", (pcmkXmlStr) crm_str(id));
c563b9
-
c563b9
-    return pcmk_rc_ok;
c563b9
-}
c563b9
-
c563b9
-static pcmk__message_entry_t fmt_functions[] = {
c563b9
-    {"health", "default", health_text },
c563b9
-    {"health", "xml", health_xml },
c563b9
-    {"pacemakerd-health", "default", pacemakerd_health_text },
c563b9
-    {"pacemakerd-health", "xml", pacemakerd_health_xml },
c563b9
-    {"dc", "default", dc_text },
c563b9
-    {"dc", "xml", dc_xml },
c563b9
-    {"crmadmin-node-list", "default", crmadmin_node_list },
c563b9
-    {"crmadmin-node", "default", crmadmin_node_text },
c563b9
-    {"crmadmin-node", "xml", crmadmin_node_xml },
c563b9
-
c563b9
-    { NULL, NULL, NULL }
c563b9
-};
c563b9
-
c563b9
 static pcmk__supported_format_t formats[] = {
c563b9
     PCMK__SUPPORTED_FORMAT_TEXT,
c563b9
     PCMK__SUPPORTED_FORMAT_XML,
c563b9
     { NULL, NULL, NULL }
c563b9
 };
c563b9
 
c563b9
-static void
c563b9
-start_main_loop()
c563b9
-{
c563b9
-        exit_code = CRM_EX_DISCONNECT; // For unexpected disconnects
c563b9
-        mainloop = g_main_loop_new(NULL, FALSE);
c563b9
-        message_timer_id = g_timeout_add(message_timeout_ms,
c563b9
-                                         admin_message_timeout, NULL);
c563b9
-        g_main_loop_run(mainloop);
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-quit_main_loop(crm_exit_t ec)
c563b9
-{
c563b9
-    exit_code = ec;
c563b9
-    if (mainloop != NULL) {
c563b9
-        GMainLoop *mloop = mainloop;
c563b9
-
c563b9
-        mainloop = NULL; // Don't re-enter this block
c563b9
-        pcmk_quit_main_loop(mloop, 10);
c563b9
-        g_main_loop_unref(mloop);
c563b9
-    }
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-event_done(pcmk_ipc_api_t *api)
c563b9
-{
c563b9
-    pcmk_disconnect_ipc(api);
c563b9
-    quit_main_loop(exit_code);
c563b9
-}
c563b9
-
c563b9
-static pcmk_controld_api_reply_t *
c563b9
-controld_event_reply(pcmk_ipc_api_t *controld_api, enum pcmk_ipc_event event_type, crm_exit_t status, void *event_data)
c563b9
-{
c563b9
-    pcmk_controld_api_reply_t *reply = event_data;
c563b9
-
c563b9
-    switch (event_type) {
c563b9
-        case pcmk_ipc_event_disconnect:
c563b9
-            if (exit_code == CRM_EX_DISCONNECT) { // Unexpected
c563b9
-                out->err(out, "error: Lost connection to controller");
c563b9
-            }
c563b9
-            event_done(controld_api);
c563b9
-            return NULL;
c563b9
-
c563b9
-        case pcmk_ipc_event_reply:
c563b9
-            break;
c563b9
-
c563b9
-        default:
c563b9
-            return NULL;
c563b9
-    }
c563b9
-
c563b9
-    if (message_timer_id != 0) {
c563b9
-        g_source_remove(message_timer_id);
c563b9
-        message_timer_id = 0;
c563b9
-    }
c563b9
-
c563b9
-    if (status != CRM_EX_OK) {
c563b9
-        out->err(out, "error: Bad reply from controller: %s",
c563b9
-                crm_exit_str(status));
c563b9
-        exit_code = status;
c563b9
-        event_done(controld_api);
c563b9
-        return NULL;
c563b9
-    }
c563b9
-
c563b9
-    if (reply->reply_type != pcmk_controld_reply_ping) {
c563b9
-        out->err(out, "error: Unknown reply type %d from controller",
c563b9
-                reply->reply_type);
c563b9
-        event_done(controld_api);
c563b9
-        return NULL;
c563b9
-    }
c563b9
-
c563b9
-    return reply;
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-controller_status_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
-                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
-                    void *event_data, void *user_data)
c563b9
-{
c563b9
-    pcmk_controld_api_reply_t *reply = controld_event_reply(controld_api,
c563b9
-        event_type, status, event_data);
c563b9
-
c563b9
-    if (reply != NULL) {
c563b9
-        out->message(out, "health",
c563b9
-               reply->data.ping.sys_from,
c563b9
-               reply->host_from,
c563b9
-               reply->data.ping.fsa_state,
c563b9
-               reply->data.ping.result);
c563b9
-        exit_code = CRM_EX_OK;
c563b9
-    }
c563b9
-
c563b9
-    event_done(controld_api);
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-designated_controller_event_cb(pcmk_ipc_api_t *controld_api,
c563b9
-                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
-                    void *event_data, void *user_data)
c563b9
-{
c563b9
-    pcmk_controld_api_reply_t *reply = controld_event_reply(controld_api,
c563b9
-        event_type, status, event_data);
c563b9
-
c563b9
-    if (reply != NULL) {
c563b9
-        out->message(out, "dc", reply->host_from);
c563b9
-        exit_code = CRM_EX_OK;
c563b9
-    }
c563b9
-
c563b9
-    event_done(controld_api);
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-pacemakerd_event_cb(pcmk_ipc_api_t *pacemakerd_api,
c563b9
-                    enum pcmk_ipc_event event_type, crm_exit_t status,
c563b9
-                    void *event_data, void *user_data)
c563b9
-{
c563b9
-    pcmk_pacemakerd_api_reply_t *reply = event_data;
c563b9
-
c563b9
-    crm_time_t *crm_when = crm_time_new(NULL);
c563b9
-    char *pinged_buf = NULL;
c563b9
-
c563b9
-    switch (event_type) {
c563b9
-        case pcmk_ipc_event_disconnect:
c563b9
-            if (exit_code == CRM_EX_DISCONNECT) { // Unexpected
c563b9
-                out->err(out, "error: Lost connection to pacemakerd");
c563b9
-            }
c563b9
-            event_done(pacemakerd_api);
c563b9
-            return;
c563b9
-
c563b9
-        case pcmk_ipc_event_reply:
c563b9
-            break;
c563b9
-
c563b9
-        default:
c563b9
-            return;
c563b9
-    }
c563b9
-
c563b9
-    if (message_timer_id != 0) {
c563b9
-        g_source_remove(message_timer_id);
c563b9
-        message_timer_id = 0;
c563b9
-    }
c563b9
-
c563b9
-    if (status != CRM_EX_OK) {
c563b9
-        out->err(out, "error: Bad reply from pacemakerd: %s",
c563b9
-                crm_exit_str(status));
c563b9
-        event_done(pacemakerd_api);
c563b9
-        return;
c563b9
-    }
c563b9
-
c563b9
-    if (reply->reply_type != pcmk_pacemakerd_reply_ping) {
c563b9
-        out->err(out, "error: Unknown reply type %d from pacemakerd",
c563b9
-                reply->reply_type);
c563b9
-        event_done(pacemakerd_api);
c563b9
-        return;
c563b9
-    }
c563b9
-
c563b9
-    // Parse desired information from reply
c563b9
-    crm_time_set_timet(crm_when, &reply->data.ping.last_good);
c563b9
-    pinged_buf = crm_time_as_string(crm_when,
c563b9
-        crm_time_log_date | crm_time_log_timeofday |
c563b9
-            crm_time_log_with_timezone);
c563b9
-
c563b9
-    out->message(out, "pacemakerd-health",
c563b9
-        reply->data.ping.sys_from,
c563b9
-        (reply->data.ping.status == pcmk_rc_ok)?
c563b9
-            pcmk_pacemakerd_api_daemon_state_enum2text(
c563b9
-                reply->data.ping.state):"query failed",
c563b9
-        (reply->data.ping.status == pcmk_rc_ok)?pinged_buf:"");
c563b9
-    exit_code = CRM_EX_OK;
c563b9
-    free(pinged_buf);
c563b9
-
c563b9
-    event_done(pacemakerd_api);
c563b9
-}
c563b9
-
c563b9
-static pcmk_ipc_api_t *
c563b9
-ipc_connect(enum pcmk_ipc_server server, pcmk_ipc_callback_t cb)
c563b9
-{
c563b9
-    int rc;
c563b9
-    pcmk_ipc_api_t *api = NULL;
c563b9
-
c563b9
-    rc = pcmk_new_ipc_api(&api, server);
c563b9
-    if (api == NULL) {
c563b9
-        out->err(out, "error: Could not connect to %s: %s",
c563b9
-                (server == pcmk_ipc_controld) ? "controller" : "pacemakerd",
c563b9
-                pcmk_rc_str(rc));
c563b9
-        exit_code = pcmk_rc2exitc(rc);
c563b9
-        return NULL;
c563b9
-    }
c563b9
-    pcmk_register_ipc_callback(api, cb, NULL);
c563b9
-    rc = pcmk_connect_ipc(api, pcmk_ipc_dispatch_main);
c563b9
-    if (rc != pcmk_rc_ok) {
c563b9
-        out->err(out, "error: Could not connect to %s: %s",
c563b9
-                (server == pcmk_ipc_controld) ? "controller" : "pacemakerd",
c563b9
-                pcmk_rc_str(rc));
c563b9
-        exit_code = pcmk_rc2exitc(rc);
c563b9
-        return NULL;
c563b9
-    }
c563b9
-
c563b9
-    return api;
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-pcmk__controller_status()
c563b9
-{
c563b9
-    pcmk_ipc_api_t *controld_api = ipc_connect(pcmk_ipc_controld, controller_status_event_cb);
c563b9
-
c563b9
-    if (controld_api != NULL) {
c563b9
-        int rc = pcmk_controld_api_ping(controld_api, dest_node);
c563b9
-        if (rc != pcmk_rc_ok) {
c563b9
-            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
-        }
c563b9
-
c563b9
-        start_main_loop();
c563b9
-
c563b9
-        pcmk_free_ipc_api(controld_api);
c563b9
-    }
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-pcmk__designated_controller()
c563b9
-{
c563b9
-    pcmk_ipc_api_t *controld_api = ipc_connect(pcmk_ipc_controld, designated_controller_event_cb);
c563b9
-
c563b9
-    if (controld_api != NULL) {
c563b9
-        int rc = pcmk_controld_api_ping(controld_api, dest_node);
c563b9
-        if (rc != pcmk_rc_ok) {
c563b9
-            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
-        }
c563b9
-
c563b9
-        start_main_loop();
c563b9
-
c563b9
-        pcmk_free_ipc_api(controld_api);
c563b9
-    }
c563b9
-}
c563b9
-
c563b9
-static void
c563b9
-pcmk__pacemakerd_status()
c563b9
-{
c563b9
-    pcmk_ipc_api_t *pacemakerd_api = ipc_connect(pcmk_ipc_pacemakerd, pacemakerd_event_cb);
c563b9
-
c563b9
-    if (pacemakerd_api != NULL) {
c563b9
-        int rc = pcmk_pacemakerd_api_ping(pacemakerd_api, ipc_name);
c563b9
-        if (rc != pcmk_rc_ok) {
c563b9
-            out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
-            exit_code = pcmk_rc2exitc(rc);
c563b9
-        }
c563b9
-
c563b9
-        start_main_loop();
c563b9
-
c563b9
-        pcmk_free_ipc_api(pacemakerd_api);
c563b9
-    }
c563b9
-}
c563b9
-
c563b9
-// \return Standard Pacemaker return code
c563b9
-static int
c563b9
-pcmk__list_nodes()
c563b9
-{
c563b9
-    cib_t *the_cib = cib_new();
c563b9
-    xmlNode *output = NULL;
c563b9
-    int rc;
c563b9
-
c563b9
-    if (the_cib == NULL) {
c563b9
-        return ENOMEM;
c563b9
-    }
c563b9
-    rc = the_cib->cmds->signon(the_cib, crm_system_name, cib_command);
c563b9
-    if (rc != pcmk_ok) {
c563b9
-        return pcmk_legacy2rc(rc);
c563b9
-    }
c563b9
-
c563b9
-    rc = the_cib->cmds->query(the_cib, NULL, &output,
c563b9
-                              cib_scope_local | cib_sync_call);
c563b9
-    if (rc == pcmk_ok) {
c563b9
-        out->message(out, "crmadmin-node-list", output);
c563b9
-        free_xml(output);
c563b9
-    }
c563b9
-    the_cib->cmds->signoff(the_cib);
c563b9
-    return pcmk_legacy2rc(rc);
c563b9
-}
c563b9
-
c563b9
 static GOptionContext *
c563b9
 build_arg_context(pcmk__common_args_t *args, GOptionGroup **group) {
c563b9
     GOptionContext *context = NULL;
c563b9
@@ -658,8 +182,10 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group) {
c563b9
 int
c563b9
 main(int argc, char **argv)
c563b9
 {
c563b9
-    int argerr = 0;
c563b9
+    pcmk__output_t *out = NULL;
c563b9
+    crm_exit_t exit_code = CRM_EX_OK;
c563b9
     int rc;
c563b9
+    int argerr = 0;
c563b9
     pcmk_ipc_api_t *controld_api = NULL;
c563b9
 
c563b9
     pcmk__common_args_t *args = pcmk__new_common_args(SUMMARY);
c563b9
@@ -683,7 +209,6 @@ main(int argc, char **argv)
c563b9
     }
c563b9
 
c563b9
     for (int i = 0; i < args->verbosity; i++) {
c563b9
-        BE_VERBOSE = TRUE;
c563b9
         crm_bump_log_level(argc, argv);
c563b9
     }
c563b9
 
c563b9
@@ -697,7 +222,7 @@ main(int argc, char **argv)
c563b9
 
c563b9
     out->quiet = args->quiet;
c563b9
 
c563b9
-    pcmk__register_messages(out, fmt_functions);
c563b9
+    pcmk__register_lib_messages(out);
c563b9
 
c563b9
     if (!pcmk__force_args(context, &error, "%s --xml-simple-list --xml-substitute", g_get_prgname())) {
c563b9
         goto done;
c563b9
@@ -708,13 +233,6 @@ main(int argc, char **argv)
c563b9
         goto done;
c563b9
     }
c563b9
 
c563b9
-    if (options.timeout) {
c563b9
-        message_timeout_ms = (guint) options.timeout;
c563b9
-        if (message_timeout_ms < 1) {
c563b9
-            message_timeout_ms = DEFAULT_MESSAGE_TIMEOUT_MS;
c563b9
-        }
c563b9
-    }
c563b9
-
c563b9
     if (options.health) {
c563b9
         out->err(out, "Cluster-wide health option not supported");
c563b9
         ++argerr;
c563b9
@@ -740,43 +258,31 @@ main(int argc, char **argv)
c563b9
 
c563b9
     switch (command) {
c563b9
         case cmd_health:
c563b9
-            pcmk__controller_status();
c563b9
-            goto done;
c563b9
+            rc = pcmk__controller_status(out, options.dest_node, options.timeout);
c563b9
+            break;
c563b9
         case cmd_pacemakerd_health:
c563b9
-            pcmk__pacemakerd_status();
c563b9
-            goto done;
c563b9
+            rc = pcmk__pacemakerd_status(out, options.ipc_name, options.timeout);
c563b9
+            break;
c563b9
         case cmd_list_nodes:
c563b9
-            rc = pcmk__list_nodes();
c563b9
-            // might need movink
c563b9
-            if (rc != pcmk_rc_ok) {
c563b9
-                out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
-                exit_code = pcmk_rc2exitc(rc);
c563b9
-            }
c563b9
+            rc = pcmk__list_nodes(out, options.BASH_EXPORT);
c563b9
             break;
c563b9
         case cmd_whois_dc:
c563b9
-            pcmk__designated_controller();
c563b9
-            goto done;
c563b9
-        default:
c563b9
-            rc = pcmk_new_ipc_api(&controld_api, pcmk_ipc_controld);
c563b9
-            if (controld_api == NULL) {
c563b9
-                out->err(out, "error: Could not connect to controller: %s",
c563b9
-                        pcmk_rc_str(rc));
c563b9
-                exit_code = pcmk_rc2exitc(rc);
c563b9
-                goto done;
c563b9
-            }
c563b9
-            rc = pcmk_connect_ipc(controld_api, pcmk_ipc_dispatch_main);
c563b9
-            if (rc != pcmk_rc_ok) {
c563b9
-                out->err(out, "error: Could not connect to controller: %s",
c563b9
-                        pcmk_rc_str(rc));
c563b9
-                exit_code = pcmk_rc2exitc(rc);
c563b9
-                goto done;
c563b9
-            }
c563b9
+            rc = pcmk__designated_controller(out, options.timeout);
c563b9
+            break;
c563b9
+        case cmd_shutdown:
c563b9
+            rc = pcmk__shutdown_controller(out, options.dest_node);
c563b9
+            break;
c563b9
+        case cmd_elect_dc:
c563b9
+            rc = pcmk__start_election(out);
c563b9
+            break;
c563b9
+        case cmd_none:
c563b9
+            rc = pcmk_rc_error;
c563b9
             break;
c563b9
     }
c563b9
 
c563b9
-    if (do_work(controld_api?controld_api:NULL)) {
c563b9
-        // A reply is needed from controller, so run main loop to get it
c563b9
-        start_main_loop();
c563b9
+    if (rc != pcmk_rc_ok) {
c563b9
+        out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
+        exit_code = pcmk_rc2exitc(rc);
c563b9
     }
c563b9
 
c563b9
 done:
c563b9
@@ -787,10 +293,6 @@ done:
c563b9
         pcmk_free_ipc_api(capi);
c563b9
     }
c563b9
 
c563b9
-    if (mainloop != NULL) {
c563b9
-        g_main_loop_unref(mainloop);
c563b9
-        mainloop = NULL;
c563b9
-    }
c563b9
     g_strfreev(processed_args);
c563b9
     g_clear_error(&error);
c563b9
     pcmk__free_arg_context(context);
c563b9
@@ -801,43 +303,3 @@ done:
c563b9
     return crm_exit(exit_code);
c563b9
 
c563b9
 }
c563b9
-
c563b9
-// \return True if reply from controller is needed
c563b9
-bool
c563b9
-do_work(pcmk_ipc_api_t *api)
c563b9
-{
c563b9
-    bool need_reply = false;
c563b9
-    int rc = pcmk_rc_ok;
c563b9
-
c563b9
-    switch (command) {
c563b9
-        case cmd_shutdown:
c563b9
-            rc = pcmk_controld_api_shutdown(api, dest_node);
c563b9
-            break;
c563b9
-
c563b9
-        case cmd_elect_dc:
c563b9
-            rc = pcmk_controld_api_start_election(api);
c563b9
-            break;
c563b9
-
c563b9
-        case cmd_none: // not actually possible here
c563b9
-            break;
c563b9
-
c563b9
-        default:
c563b9
-            break;
c563b9
-    }
c563b9
-    if (rc != pcmk_rc_ok) {
c563b9
-        out->err(out, "error: Command failed: %s", pcmk_rc_str(rc));
c563b9
-        exit_code = pcmk_rc2exitc(rc);
c563b9
-    }
c563b9
-    return need_reply;
c563b9
-}
c563b9
-
c563b9
-gboolean
c563b9
-admin_message_timeout(gpointer data)
c563b9
-{
c563b9
-    out->err(out,
c563b9
-            "error: No reply received from controller before timeout (%dms)",
c563b9
-            message_timeout_ms);
c563b9
-    message_timer_id = 0;
c563b9
-    quit_main_loop(CRM_EX_TIMEOUT);
c563b9
-    return FALSE; // Tells glib to remove source
c563b9
-}
c563b9
-- 
c563b9
1.8.3.1
c563b9