Refactor: controller: rename controld_delete_node_state()

... to controld_delete_node_history(), and
controld_node_state_deletion_strings() to
controld_node_history_deletion_strings(),
since they only delete history now

Author: Ken Gaillot

daemons/controld/controld_cib.c

@@ -287,8 +287,8 @@ cib_delete_callback(xmlNode *msg, int call_id, int rc, xmlNode *output,
  * \param[out] desc           If not NULL, where to store loggable description
  */
 void
-controld_node_state_deletion_strings(const char *uname, bool unlocked_only,
-                                     char **xpath, char **desc)
+controld_node_history_deletion_strings(const char *uname, bool unlocked_only,
+                                       char **xpath, char **desc)
 {
     const char *desc_pre = NULL;
 
@@ -319,7 +319,7 @@ controld_node_state_deletion_strings(const char *uname, bool unlocked_only,
  * \param[in] options        CIB call options to use
  */
 void
-controld_delete_node_state(const char *uname, bool unlocked_only, int options)
+controld_delete_node_history(const char *uname, bool unlocked_only, int options)
 {
     cib_t *cib = controld_globals.cib_conn;
     char *xpath = NULL;
@@ -328,7 +328,7 @@ controld_delete_node_state(const char *uname, bool unlocked_only, int options)
 
     pcmk__assert((uname != NULL) && (cib != NULL));
 
-    controld_node_state_deletion_strings(uname, unlocked_only, &xpath, &desc);
+    controld_node_history_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,10 +46,11 @@ int controld_update_cib(const char *section, xmlNode *data, int options,
                                          void *));
 unsigned int cib_op_timeout(void);
 
-void controld_node_state_deletion_strings(const char *uname, bool unlocked_only,
-                                          char **xpath, char **desc);
-void controld_delete_node_state(const char *uname, bool unlocked_only,
-                                int options);
+void controld_node_history_deletion_strings(const char *uname,
+                                            bool unlocked_only,
+                                            char **xpath, char **desc);
+void controld_delete_node_history(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

@@ -1071,7 +1071,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, false, cib_none);
+    controld_delete_node_history(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, false, cib_none);
+    controld_delete_node_history(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

@@ -824,8 +824,8 @@ do_dc_join_ack(long long action, enum crmd_fsa_cause cause,
     }
 
     // Delete relevant parts of node's current executor state from CIB
-    controld_node_state_deletion_strings(join_from, unlocked_only, &xpath,
-                                         NULL);
+    controld_node_history_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

@@ -213,7 +213,7 @@ purge_remote_node_attrs(int call_opt, pcmk__node_status_t *node)
         controld_purge_node_attrs(node->name, true);
     }
 
-    controld_delete_node_state(node->name, unlocked_only, call_opt);
+    controld_delete_node_history(node->name, unlocked_only, call_opt);
 }
 
 /*!
@@ -322,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, false, call_opt);
+        controld_delete_node_history(node_name, false, call_opt);
     }
 
     /* Ensure node is in the remote peer cache with lost state */