Refactor: controller: drop node state section enum

It now boils down to a bool for whether we want only unlocked resources

Author: Ken Gaillot

daemons/controld/controld_cib.c

@@ -281,16 +281,15 @@ cib_delete_callback(xmlNode *msg, int call_id, int rc, xmlNode *output,
 
 /*!
  * \internal
- * \brief Get the XPath and description of a node state section to be deleted
+ * \brief Get the XPath and description of resource history to be deleted
  *
- * \param[in]  uname    Desired node
- * \param[in]  section  Subsection of \c PCMK__XE_NODE_STATE to be deleted
- * \param[out] xpath    Where to store XPath of \p section
- * \param[out] desc     If not \c NULL, where to store description of \p section
+ * \param[in]  uname          Name of node to delete resource history for
+ * \param[in]  unlocked_only  If true, delete history of only unlocked resources
+ * \param[out] xpath          Where to store XPath for history deletion
+ * \param[out] desc           If not NULL, where to store loggable description
  */
 void
-controld_node_state_deletion_strings(const char *uname,
-                                     enum controld_section_e section,
+controld_node_state_deletion_strings(const char *uname, bool unlocked_only,
                                      char **xpath, char **desc)
 {
     const char *desc_pre = NULL;
@@ -299,20 +298,13 @@ controld_node_state_deletion_strings(const char *uname,
     long long expire = (long long) time(NULL)
                        - controld_globals.shutdown_lock_limit;
 
-    switch (section) {
-        case controld_section_lrm:
-            *xpath = pcmk__assert_asprintf(XPATH_NODE_LRM, uname);
-            desc_pre = "resource history";
-            break;
-        case controld_section_lrm_unlocked:
-            *xpath = pcmk__assert_asprintf(XPATH_NODE_LRM_UNLOCKED, uname,
-                                           uname, expire);
-            desc_pre = "resource history (other than shutdown locks)";
-            break;
-        default:
-            // We called this function incorrectly
-            pcmk__assert(false);
-            break;
+    if (unlocked_only) {
+        *xpath = pcmk__assert_asprintf(XPATH_NODE_LRM_UNLOCKED,
+                                       uname, uname, expire);
+        desc_pre = "resource history (other than shutdown locks)";
+    } else {
+        *xpath = pcmk__assert_asprintf(XPATH_NODE_LRM, uname);
+        desc_pre = "resource history";
     }
 
     if (desc != NULL) {
@@ -322,15 +314,14 @@ controld_node_state_deletion_strings(const char *uname,
 
 /*!
  * \internal
- * \brief Delete subsection of a node's CIB \c PCMK__XE_NODE_STATE
+ * \brief Delete a node's resource history from the CIB
  *
- * \param[in] uname    Desired node
- * \param[in] section  Subsection of \c PCMK__XE_NODE_STATE to delete
- * \param[in] options  CIB call options to use
+ * \param[in] uname          Name of node to delete resource history for
+ * \param[in] unlocked_only  If true, delete history of only unlocked resources
+ * \param[in] options        CIB call options to use
  */
 void
-controld_delete_node_state(const char *uname, enum controld_section_e section,
-                           int options)
+controld_delete_node_state(const char *uname, bool unlocked_only, int options)
 {
     cib_t *cib = controld_globals.cib_conn;
     char *xpath = NULL;
@@ -339,8 +330,7 @@ controld_delete_node_state(const char *uname, enum controld_section_e section,
 
     pcmk__assert((uname != NULL) && (cib != NULL));
 
-    controld_node_state_deletion_strings(uname, section, &xpath, &desc);
-
+    controld_node_state_deletion_strings(uname, unlocked_only, &xpath, &desc);
     cib__set_call_options(options, "node state deletion",
                           cib_xpath|cib_multiple);
     cib_rc = cib->cmds->remove(cib, xpath, NULL, options);

daemons/controld/controld_cib.h

@@ -46,17 +46,10 @@ int controld_update_cib(const char *section, xmlNode *data, int options,
                                          void *));
 unsigned int cib_op_timeout(void);
 
-// Subsections of PCMK__XE_NODE_STATE
-enum controld_section_e {
-    controld_section_lrm,
-    controld_section_lrm_unlocked,
-};
-
-void controld_node_state_deletion_strings(const char *uname,
-                                          enum controld_section_e section,
+void controld_node_state_deletion_strings(const char *uname, bool unlocked_only,
                                           char **xpath, char **desc);
-void controld_delete_node_state(const char *uname,
-                                enum controld_section_e section, int options);
+void controld_delete_node_state(const char *uname, bool unlocked_only,
+                                int options);
 int controld_delete_resource_history(const char *rsc_id, const char *node,
                                      const char *user_name, int call_options);
 

daemons/controld/controld_execd.c

@@ -1074,8 +1074,7 @@ force_reprobe(lrm_state_t *lrm_state, const char *from_sys,
     }
 
     /* Now delete the copy in the CIB */
-    controld_delete_node_state(lrm_state->node_name, controld_section_lrm,
-                               cib_none);
+    controld_delete_node_state(lrm_state->node_name, false, cib_none);
 }
 
 /*!

daemons/controld/controld_fencing.c

@@ -248,7 +248,7 @@ update_node_state_after_fencing(const char *target, const char *target_xml_id)
     fsa_register_cib_callback(rc, pcmk__str_copy(target), cib_fencing_updated);
 
     // Delete node's resource history from CIB
-    controld_delete_node_state(peer->name, controld_section_lrm, cib_none);
+    controld_delete_node_state(peer->name, false, cib_none);
 
     // Ask attribute manager to delete node's transient attributes
     // @TODO: This is the only call to controld_purge_node_attrs that doesn't

daemons/controld/controld_join_dc.c

@@ -772,7 +772,8 @@ do_dc_join_ack(long long action,
     pcmk__node_status_t *peer = NULL;
     enum controld_join_phase phase = controld_join_none;
 
-    enum controld_section_e section = controld_section_lrm;
+    const bool unlocked_only = pcmk__is_set(controld_globals.flags,
+                                            controld_shutdown_lock_enabled);
     char *xpath = NULL;
     xmlNode *state = NULL;
     xmlNode *execd_state = NULL;
@@ -841,10 +842,8 @@ do_dc_join_ack(long long action,
     }
 
     // Delete relevant parts of node's current executor state from CIB
-    if (pcmk__is_set(controld_globals.flags, controld_shutdown_lock_enabled)) {
-        section = controld_section_lrm_unlocked;
-    }
-    controld_node_state_deletion_strings(join_from, section, &xpath, NULL);
+    controld_node_state_deletion_strings(join_from, unlocked_only, &xpath,
+                                         NULL);
 
     rc = cib->cmds->remove(cib, xpath, NULL,
                            cib_xpath|cib_multiple|cib_transaction);

daemons/controld/controld_remote_ra.c

@@ -205,17 +205,15 @@ should_purge_attributes(pcmk__node_status_t *node)
 static void
 purge_remote_node_attrs(int call_opt, pcmk__node_status_t *node)
 {
-    enum controld_section_e section = controld_section_lrm;
+    const bool unlocked_only = pcmk__is_set(controld_globals.flags,
+                                            controld_shutdown_lock_enabled);
 
     // Purge node's transient attributes (from attribute manager and CIB)
     if (should_purge_attributes(node)) {
         controld_purge_node_attrs(node->name, true);
     }
 
-    if (pcmk__is_set(controld_globals.flags, controld_shutdown_lock_enabled)) {
-        section = controld_section_lrm_unlocked;
-    }
-    controld_delete_node_state(node->name, section, call_opt);
+    controld_delete_node_state(node->name, unlocked_only, call_opt);
 }
 
 /*!
@@ -324,7 +322,7 @@ remote_node_down(const char *node_name, const enum down_opts opts)
      * think resources are still running on the node.
      */
     if (opts == DOWN_ERASE_LRM) {
-        controld_delete_node_state(node_name, controld_section_lrm, call_opt);
+        controld_delete_node_state(node_name, false, call_opt);
     }
 
     /* Ensure node is in the remote peer cache with lost state */