Merge pull request #3981 from nrwahl2/nrwahl2-controller_first

Drop things from controller

Author: clumens

daemons/controld/controld_attrd.c

@@ -55,7 +55,7 @@ handle_attr_error(void)
 
     } else if (pcmk__is_set(controld_globals.fsa_input_register, R_SHUTDOWN)) {
         // Fast-track shutdown since unable to request via attribute
-        register_fsa_input(C_FSA_INTERNAL, I_FAIL, NULL);
+        controld_fsa_append(C_FSA_INTERNAL, I_FAIL, NULL);
     }
 }
 

daemons/controld/controld_callbacks.c

@@ -46,7 +46,7 @@ crmd_ha_msg_filter(xmlNode * msg)
 
                     level = LOG_WARNING;
                     new_input.msg = msg;
-                    register_fsa_error_adv(C_FSA_INTERNAL, I_ELECTION, NULL, &new_input,
+                    register_fsa_error_adv(I_ELECTION, NULL, &new_input,
                                            __func__);
                 }
 
@@ -228,7 +228,7 @@ peer_update_callback(enum pcmk__node_update type, pcmk__node_status_t *node,
             if (!appeared && controld_is_local_node(node->name)) {
                 /* Did we get evicted? */
                 crm_notice("Our peer connection failed");
-                register_fsa_input(C_CRMD_STATUS_CALLBACK, I_ERROR, NULL);
+                controld_fsa_append(C_CRMD_STATUS_CALLBACK, I_ERROR, NULL);
 
             } else if (pcmk__str_eq(node->name, controld_globals.dc_name,
                                     pcmk__str_casei)
@@ -244,7 +244,7 @@ peer_update_callback(enum pcmk__node_update type, pcmk__node_status_t *node,
                 crm_notice("Our peer on the DC (%s) is dead",
                            controld_globals.dc_name);
 
-                register_fsa_input(C_CRMD_STATUS_CALLBACK, I_ELECTION, NULL);
+                controld_fsa_append(C_CRMD_STATUS_CALLBACK, I_ELECTION, NULL);
                 controld_delete_node_state(node->name, controld_section_attrs,
                                            cib_none);
 
@@ -276,7 +276,7 @@ peer_update_callback(enum pcmk__node_update type, pcmk__node_status_t *node,
                   alive, appeared, (down? down->id : -1));
 
         if (appeared && (alive > 0) && !is_remote) {
-            register_fsa_input_before(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
+            controld_fsa_prepend(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
         }
 
         if (down) {

daemons/controld/controld_cib.c

@@ -38,7 +38,7 @@ handle_cib_disconnect(gpointer user_data)
     if (pcmk__is_set(controld_globals.fsa_input_register, R_CIB_CONNECTED)) {
         // @TODO This should trigger a reconnect, not a shutdown
         crm_crit("Lost connection to the CIB manager, shutting down");
-        register_fsa_input(C_FSA_INTERNAL, I_ERROR, NULL);
+        controld_fsa_append(C_FSA_INTERNAL, I_ERROR, NULL);
         controld_clear_fsa_input_flags(R_CIB_CONNECTED);
 
     } else { // Expected
@@ -91,7 +91,7 @@ do_cib_updated(const char *event, xmlNode * msg)
 
         populate_cib_nodes(controld_node_update_quick|controld_node_update_all,
                            __func__);
-        register_fsa_input(C_FSA_INTERNAL, I_ELECTION, NULL);
+        controld_fsa_append(C_FSA_INTERNAL, I_ELECTION, NULL);
     }
 }
 
@@ -195,7 +195,7 @@ do_cib_control(long long action,
         } else {
             crm_err("Could not complete CIB registration %d times... "
                     "hard error", cib_retries);
-            register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+            register_fsa_error(I_ERROR);
         }
     }
 }

daemons/controld/controld_control.c

@@ -79,7 +79,7 @@ do_ha_control(long long action,
 
         if (!registered) {
             controld_set_fsa_input_flags(R_HA_DISCONNECTED);
-            register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+            register_fsa_error(I_ERROR);
             return;
         }
 
@@ -122,7 +122,7 @@ do_shutdown_req(long long action,
                             CRM_SYSTEM_CRMD, CRM_OP_SHUTDOWN_REQ, NULL);
 
     if (!pcmk__cluster_send_message(NULL, pcmk_ipc_controld, msg)) {
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
     }
     pcmk__xml_free(msg);
 }
@@ -349,7 +349,7 @@ do_startup(long long action,
 
     lrm_state_init_local();
     if (controld_init_fsa_timers() == FALSE) {
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
     }
 }
 
@@ -456,7 +456,7 @@ do_stop(long long action,
 {
     crm_trace("Closing IPC server");
     mainloop_del_ipc_server(ipcs); ipcs = NULL;
-    register_fsa_input(C_FSA_INTERNAL, I_TERMINATE, NULL);
+    controld_fsa_append(C_FSA_INTERNAL, I_TERMINATE, NULL);
 }
 
 /*	 A_STARTED	*/
@@ -516,15 +516,15 @@ do_started(long long action,
     ipcs = pcmk__serve_controld_ipc(&crmd_callbacks);
     if (ipcs == NULL) {
         crm_err("Failed to create IPC server: shutting down and inhibiting respawn");
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
     } else {
         crm_notice("Pacemaker controller successfully started and accepting connections");
     }
     controld_set_fsa_input_flags(R_ST_REQUIRED);
     controld_timer_fencer_connect(GINT_TO_POINTER(TRUE));
 
     controld_clear_fsa_input_flags(R_STARTING);
-    register_fsa_input(msg_data->fsa_cause, I_PENDING, NULL);
+    controld_fsa_append(msg_data->fsa_cause, I_PENDING, NULL);
 }
 
 /*	 A_RECOVER	*/
@@ -536,7 +536,7 @@ do_recover(long long action,
     controld_set_fsa_input_flags(R_IN_RECOVERY);
     crm_warn("Fast-tracking shutdown in response to errors");
 
-    register_fsa_input(C_FSA_INTERNAL, I_TERMINATE, NULL);
+    controld_fsa_append(C_FSA_INTERNAL, I_TERMINATE, NULL);
 }
 
 static void
@@ -555,7 +555,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
         fsa_data_t *msg_data = NULL;
 
         crm_err("Local CIB query resulted in an error: %s", pcmk_strerror(rc));
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
 
         if (rc == -EACCES || rc == -pcmk_err_schema_validation) {
             crm_err("The cluster is mis-configured - shutting down and staying down");
@@ -573,7 +573,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
         fsa_data_t *msg_data = NULL;
 
         crm_err("Local CIB query for " PCMK_XE_CRM_CONFIG " section failed");
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
         goto bail;
     }
 
@@ -696,12 +696,12 @@ crm_shutdown(int nsig)
 
     if (pcmk__is_set(controld_globals.fsa_input_register, R_SHUTDOWN)) {
         crm_err("Escalating shutdown");
-        register_fsa_input_before(C_SHUTDOWN, I_ERROR, NULL);
+        controld_fsa_prepend(C_SHUTDOWN, I_ERROR, NULL);
         return;
     }
 
     controld_set_fsa_input_flags(R_SHUTDOWN);
-    register_fsa_input(C_SHUTDOWN, I_SHUTDOWN, NULL);
+    controld_fsa_append(C_SHUTDOWN, I_SHUTDOWN, NULL);
 
     /* If shutdown timer doesn't have a period set, use the default
      *

daemons/controld/controld_election.c

@@ -22,7 +22,7 @@
 static void
 election_win_cb(pcmk_cluster_t *cluster)
 {
-    register_fsa_input(C_FSA_INTERNAL, I_ELECTION_DC, NULL);
+    controld_fsa_append(C_FSA_INTERNAL, I_ELECTION_DC, NULL);
 }
 
 void
@@ -100,12 +100,8 @@ do_election_vote(long long action,
     }
 
     if (not_voting) {
-        if (AM_I_DC) {
-            register_fsa_input(C_FSA_INTERNAL, I_RELEASE_DC, NULL);
-
-        } else {
-            register_fsa_input(C_FSA_INTERNAL, I_PENDING, NULL);
-        }
+        controld_fsa_append(C_FSA_INTERNAL, (AM_I_DC? I_RELEASE_DC : I_PENDING),
+                            NULL);
         return;
     }
 
@@ -134,7 +130,7 @@ do_election_count_vote(long long action,
                        enum crmd_fsa_input current_input, fsa_data_t * msg_data)
 {
     enum election_result rc = 0;
-    ha_msg_input_t *vote = fsa_typed_data(fsa_dt_ha_msg);
+    ha_msg_input_t *vote = NULL;
 
     if (pcmk__peer_cache == NULL) {
         if (!pcmk__is_set(controld_globals.fsa_input_register, R_SHUTDOWN)) {
@@ -143,12 +139,15 @@ do_election_count_vote(long long action,
         return;
     }
 
+    pcmk__assert((msg_data != NULL) && (msg_data->data != NULL));
+    vote = msg_data->data;
+
     rc = election_count_vote(controld_globals.cluster, vote->msg,
                              (cur_state != S_STARTING));
     switch(rc) {
         case election_start:
             election_reset(controld_globals.cluster);
-            register_fsa_input(C_FSA_INTERNAL, I_ELECTION, NULL);
+            controld_fsa_append(C_FSA_INTERNAL, I_ELECTION, NULL);
             break;
 
         case election_lost:
@@ -157,11 +156,11 @@ do_election_count_vote(long long action,
             if (pcmk__is_set(controld_globals.fsa_input_register, R_THE_DC)) {
                 cib_t *cib_conn = controld_globals.cib_conn;
 
-                register_fsa_input(C_FSA_INTERNAL, I_RELEASE_DC, NULL);
+                controld_fsa_append(C_FSA_INTERNAL, I_RELEASE_DC, NULL);
                 cib_conn->cmds->set_secondary(cib_conn, cib_none);
 
             } else if (cur_state != S_STARTING) {
-                register_fsa_input(C_FSA_INTERNAL, I_PENDING, NULL);
+                controld_fsa_append(C_FSA_INTERNAL, I_PENDING, NULL);
             }
             break;
 
@@ -178,7 +177,7 @@ feature_update_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, vo
 
         crm_notice("Feature update failed: %s " QB_XS " rc=%d",
                    pcmk_strerror(rc), rc);
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
     }
 }
 
@@ -269,7 +268,7 @@ do_dc_release(long long action,
             fsa_cib_anon_update_discard_reply(PCMK_XE_STATUS, update);
             pcmk__xml_free(update);
         }
-        register_fsa_input(C_FSA_INTERNAL, I_RELEASE_SUCCESS, NULL);
+        controld_fsa_append(C_FSA_INTERNAL, I_RELEASE_SUCCESS, NULL);
 
     } else {
         crm_err("Unknown DC action %s", fsa_action2string(action));

daemons/controld/controld_execd.c

@@ -51,7 +51,7 @@ lrm_connection_destroy(void)
 {
     if (pcmk__is_set(controld_globals.fsa_input_register, R_LRM_CONNECTED)) {
         crm_crit("Lost connection to local executor");
-        register_fsa_input(C_FSA_INTERNAL, I_ERROR, NULL);
+        controld_fsa_append(C_FSA_INTERNAL, I_ERROR, NULL);
         controld_clear_fsa_input_flags(R_LRM_CONNECTED);
     }
 }
@@ -339,7 +339,7 @@ try_local_executor_connect(long long action, fsa_data_t *msg_data,
             "%d time%s: %s", lrm_state->num_lrm_register_fails,
             pcmk__plural_s(lrm_state->num_lrm_register_fails),
             pcmk_rc_str(rc));
-    register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+    register_fsa_error(I_ERROR);
 }
 
 /*	 A_LRM_CONNECT	*/
@@ -361,7 +361,7 @@ do_lrm_control(long long action,
     }
     lrm_state = controld_get_executor_state(NULL, true);
     if (lrm_state == NULL) {
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
         return;
     }
 
@@ -953,7 +953,7 @@ get_lrm_resource(lrm_state_t *lrm_state, const xmlNode *rsc_xml,
              * remote node, which is not an FSA failure.
              */
             if (lrm_state_is_local(lrm_state) == TRUE) {
-                register_fsa_error(C_FSA_INTERNAL, I_FAIL, NULL);
+                register_fsa_error(I_FAIL);
             }
             return rc;
         }
@@ -1386,24 +1386,25 @@ metadata_complete(int pid, const pcmk__action_result_t *result, void *user_data)
     free_metadata_cb_data(data);
 }
 
-/*	 A_LRM_INVOKE	*/
 void
-do_lrm_invoke(long long action,
-              enum crmd_fsa_cause cause,
-              enum crmd_fsa_state cur_state,
-              enum crmd_fsa_input current_input, fsa_data_t * msg_data)
+controld_invoke_execd(fsa_data_t *msg_data)
 {
     lrm_state_t *lrm_state = NULL;
     const char *crm_op = NULL;
     const char *from_sys = NULL;
     const char *from_host = NULL;
     const char *operation = NULL;
-    ha_msg_input_t *input = fsa_typed_data(fsa_dt_ha_msg);
     const char *user_name = NULL;
-    const char *target_node = lrm_op_target(input->xml);
+    ha_msg_input_t *input = NULL;
+    const char *target_node = NULL;
     gboolean is_remote_node = FALSE;
     bool crm_rsc_delete = FALSE;
 
+    pcmk__assert((msg_data != NULL) && (msg_data->data != NULL));
+
+    input = msg_data->data;
+    target_node = lrm_op_target(input->xml);
+
     // Message routed to the local node is targeting a specific, non-local node
     is_remote_node = !controld_is_local_node(target_node);
 
@@ -1568,7 +1569,7 @@ do_lrm_invoke(long long action,
     } else {
         crm_err("Invalid execution request: unknown command '%s' (bug?)",
                 crm_op);
-        register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+        register_fsa_error(I_ERROR);
     }
 }
 
@@ -1871,7 +1872,7 @@ should_nack_action(const char *action)
     if (pcmk__is_set(controld_globals.fsa_input_register, R_SHUTDOWN)
         && pcmk__str_eq(action, PCMK_ACTION_START, pcmk__str_none)) {
 
-        register_fsa_input(C_SHUTDOWN, I_SHUTDOWN, NULL);
+        controld_fsa_append(C_SHUTDOWN, I_SHUTDOWN, NULL);
         return "Not attempting start due to shutdown in progress";
     }
 
@@ -2031,7 +2032,7 @@ do_lrm_rsc_op(lrm_state_t *lrm_state, lrmd_rsc_info_t *rsc, xmlNode *msg,
         fake_op_status(lrm_state, op, PCMK_EXEC_NOT_CONNECTED,
                        PCMK_OCF_UNKNOWN_ERROR, pcmk_rc_str(rc));
         process_lrm_event(lrm_state, op, NULL, NULL);
-        register_fsa_error(C_FSA_INTERNAL, I_FAIL, NULL);
+        register_fsa_error(I_FAIL);
 
     } else {
         crm_err("Could not initiate %s action for resource %s remotely on %s: "

daemons/controld/controld_execd_state.c

@@ -681,7 +681,9 @@ lrm_state_cancel(lrm_state_t *lrm_state, const char *rsc_id, const char *action,
     }
 
     /* Figure out a way to make this async?
-     * NOTICE: Currently it's synced and directly acknowledged in do_lrm_invoke(). */
+     * NOTICE: Currently it's synced and directly acknowledged in
+     * controld_invoke_execd().
+     */
     if (is_remote_lrmd_ra(NULL, NULL, rsc_id)) {
         return remote_ra_cancel(lrm_state, rsc_id, action, interval_ms);
     }