Refactor: controller: Light cleanup of lrm_state_unregister_rsc()

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

daemons/controld/controld_execd.c

@@ -835,18 +835,19 @@ delete_resource(lrm_state_t *lrm_state, const char *id, lrmd_rsc_info_t *rsc,
                 GHashTableIter *iter, const char *sys, const char *user,
                 ha_msg_input_t *request, bool unregister, bool from_cib)
 {
-    int rc = pcmk_ok;
+    int rc = pcmk_rc_ok;
 
     pcmk__info("Removing resource %s from executor for %s%s%s", id, sys,
                ((user != NULL)? " as " : ""), pcmk__s(user, ""));
 
     if (rsc && unregister) {
-        rc = lrm_state_unregister_rsc(lrm_state, id);
+        rc = controld_execd_state_unregister_rsc(lrm_state, id);
     }
 
-    if (rc == pcmk_ok) {
+    if (rc == pcmk_rc_ok) {
         pcmk__trace("Resource %s deleted from executor", id);
-    } else if (rc == -EINPROGRESS) {
+
+    } else if (rc == EINPROGRESS) {
         pcmk__info("Deletion of resource '%s' from executor is pending", id);
         if (request) {
             struct pending_deletion_op_s *op = NULL;
@@ -857,15 +858,16 @@ delete_resource(lrm_state_t *lrm_state, const char *id, lrmd_rsc_info_t *rsc,
             op->input = copy_ha_msg_input(request);
             g_hash_table_insert(lrm_state->deletion_ops, ref, op);
         }
+
         return;
+
     } else {
         pcmk__warn("Could not delete '%s' from executor for %s%s%s: %s "
                    QB_XS " rc=%d",
                    id, sys, ((user != NULL)? " as " : ""), pcmk__s(user, ""),
-                   pcmk_strerror(rc), rc);
+                   pcmk_rc_str(rc), rc);
     }
 
-    rc = pcmk_legacy2rc(rc);
     delete_rsc_entry(lrm_state, request, id, iter, rc, user, from_cib);
 }
 

daemons/controld/controld_execd.h

@@ -151,7 +151,8 @@ lrmd_rsc_info_t *controld_execd_state_get_rsc_info(lrm_state_t *lrm_state,
 int controld_execd_state_register_rsc(lrm_state_t *lrm_state,
                                       const char *rsc_id, const char *class,
                                       const char *provider, const char *agent);
-int lrm_state_unregister_rsc(lrm_state_t *lrm_state, const char *rsc_id);
+int controld_execd_state_unregister_rsc(lrm_state_t *lrm_state,
+                                        const char *rsc_id);
 
 // Functions used to manage remote executor connection resources
 void remote_lrm_op_callback(lrmd_event_data_t * op);

daemons/controld/controld_execd_state.c

@@ -1007,27 +1007,44 @@ controld_execd_state_register_rsc(lrm_state_t *lrm_state, const char *rsc_id,
     return pcmk_legacy2rc(rc);
 }
 
+/*!
+ * \internal
+ * \brief Unegister a resource with the executor via a given state object
+ *
+ * If \p rsc_id is the name of a remote connection resource, remove the executor
+ * state object for node \p rsc_id from the state table.
+ *
+ * Otherwise, remove the \p lrm_state resource info cache entry for \p rsc_id,
+ * and send an unregister request to the executor for \p rsc_id.
+ *
+ * \param[in,out] lrm_state    Executor state
+ * \param[in]     rsc_id       Resource ID
+ *
+ * \return Standard Pacemaker return code
+ *
+ * \todo This function probably shouldn't handle remote connection resources,
+ *       since it doesn't unregister a resource in that case.
+ */
 int
-lrm_state_unregister_rsc(lrm_state_t *lrm_state, const char *rsc_id)
+controld_execd_state_unregister_rsc(lrm_state_t *lrm_state, const char *rsc_id)
 {
+    int rc = pcmk_rc_ok;
+
     pcmk__assert(lrm_state != NULL);
 
     if (lrm_state->conn == NULL) {
-        return -ENOTCONN;
+        return ENOTCONN;
     }
 
     if (is_remote_lrmd_ra(rsc_id)) {
         g_hash_table_remove(lrm_state_table, rsc_id);
-        return pcmk_ok;
+        return pcmk_rc_ok;
     }
 
     g_hash_table_remove(lrm_state->rsc_info_cache, rsc_id);
 
-    /* @TODO Optimize this ... this function is a blocking round trip from
-     * client to daemon. The controld_execd_state.c code path that uses this
-     * function should always treat it as an async operation. The executor API
-     * should make an async version available.
-     */
-    return lrm_state->conn->cmds->unregister_rsc(lrm_state->conn, rsc_id,
-                                                 lrmd_opt_none);
+    // @TODO Implement an asynchronous version of this
+    rc = lrm_state->conn->cmds->unregister_rsc(lrm_state->conn, rsc_id,
+                                               lrmd_opt_none);
+    return pcmk_legacy2rc(rc);
 }