Refactor: libcrmcommon: remove dead code

Ken Gaillot · Ken Gaillot · commit 32c75b7becfd · 2018-02-23T16:45:43.000-06:00
This breaks the public API by removing the following symbols:
* SERVICE_SCRIPT
* crm_remote_baremetal
* crm_remote_container
* crm_remote_peer_cache_add()
* crm_status_rstate (crm_status_nstate is now sent for all node types)
* get_cib_copy()
* pe_action_failure_is_fatal
diff --git a/attrd/commands.c b/attrd/commands.c
@@ -732,7 +732,7 @@ attrd_lookup_or_create_value(GHashTable *values, const char *host, xmlNode *xml)
         }
 
         /* Ensure this host is in the remote peer cache */
-        crm_remote_peer_cache_add(host);
+        CRM_ASSERT(crm_remote_peer_get(host) != NULL);
     }
 
     if (v == NULL) {
@@ -966,7 +966,7 @@ attrd_election_cb(gpointer user_data)
 void
 attrd_peer_change_cb(enum crm_status_type kind, crm_node_t *peer, const void *data)
 {
-    if ((kind == crm_status_nstate) || (kind == crm_status_rstate)) {
+    if (kind == crm_status_nstate) {
         if (safe_str_eq(peer->state, CRM_NODE_MEMBER)) {
             /* If we're the writer, send new peers a list of all attributes
              * (unless it's a remote node, which doesn't run its own attrd)
diff --git a/cib/main.c b/cib/main.c
@@ -316,7 +316,6 @@ cib_peer_update_callback(enum crm_status_type type, crm_node_t * node, const voi
             break;
 
         case crm_status_uname:
-        case crm_status_rstate:
         case crm_status_nstate:
             if (cib_shutdown_flag && (crm_active_peers() < 2)
                 && crm_hash_table_size(client_connections) == 0) {
diff --git a/crmd/callbacks.c b/crmd/callbacks.c
@@ -113,7 +113,6 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
                      node->uname, state_text(node->state));
             return;
 
-        case crm_status_rstate:
         case crm_status_nstate:
             /* This callback should not be called unless the state actually
              * changed, but here's a failsafe just in case.
diff --git a/crmd/fsa_defines.h b/crmd/fsa_defines.h
@@ -472,13 +472,9 @@ enum crmd_fsa_cause {
     C_HA_MESSAGE,
     C_CRMD_STATUS_CALLBACK,
     C_LRM_OP_CALLBACK,
-    C_LRM_MONITOR_CALLBACK,
     C_TIMER_POPPED,
     C_SHUTDOWN,
-    C_HEARTBEAT_FAILED,
-    C_SUBSYSTEM_CONNECT,
     C_FSA_INTERNAL,
-    C_ILLEGAL
 };
 
 extern const char *fsa_input2string(enum crmd_fsa_input input);
diff --git a/crmd/messages.c b/crmd/messages.c
@@ -146,12 +146,8 @@ register_fsa_input_adv(enum crmd_fsa_cause cause, enum crmd_fsa_input input,
                 fsa_data->data_type = fsa_dt_lrm;
                 break;
 
-            case C_SUBSYSTEM_CONNECT:
-            case C_LRM_MONITOR_CALLBACK:
             case C_TIMER_POPPED:
             case C_SHUTDOWN:
-            case C_HEARTBEAT_FAILED:
-            case C_ILLEGAL:
             case C_UNKNOWN:
             case C_STARTUP:
                 crm_err("Copying %s data (from %s)"
diff --git a/crmd/utils.c b/crmd/utils.c
@@ -425,27 +425,15 @@ fsa_cause2string(enum crmd_fsa_cause cause)
         case C_SHUTDOWN:
             causeAsText = "C_SHUTDOWN";
             break;
-        case C_HEARTBEAT_FAILED:
-            causeAsText = "C_HEARTBEAT_FAILED";
-            break;
-        case C_SUBSYSTEM_CONNECT:
-            causeAsText = "C_SUBSYSTEM_CONNECT";
-            break;
         case C_LRM_OP_CALLBACK:
             causeAsText = "C_LRM_OP_CALLBACK";
             break;
-        case C_LRM_MONITOR_CALLBACK:
-            causeAsText = "C_LRM_MONITOR_CALLBACK";
-            break;
         case C_CRMD_STATUS_CALLBACK:
             causeAsText = "C_CRMD_STATUS_CALLBACK";
             break;
         case C_FSA_INTERNAL:
             causeAsText = "C_FSA_INTERNAL";
             break;
-        case C_ILLEGAL:
-            causeAsText = "C_ILLEGAL";
-            break;
     }
 
     if (causeAsText == NULL) {
diff --git a/fencing/commands.c b/fencing/commands.c
@@ -2617,17 +2617,6 @@ handle_request(crm_client_t * client, uint32_t id, uint32_t flags, xmlNode * req
         rc = stonith_level_remove(request, &device_id);
         do_stonith_notify_level(call_options, op, rc, device_id);
 
-    } else if (crm_str_eq(op, STONITH_OP_CONFIRM, TRUE)) {
-        async_command_t *cmd = create_async_command(request);
-        xmlNode *reply = stonith_construct_async_reply(cmd, NULL, NULL, 0);
-
-        crm_xml_add(reply, F_STONITH_OPERATION, T_STONITH_NOTIFY);
-        crm_notice("Broadcasting manual fencing confirmation for node %s", cmd->victim);
-        send_cluster_message(NULL, crm_msg_stonith_ng, reply, FALSE);
-
-        free_async_command(cmd);
-        free_xml(reply);
-
     } else if(safe_str_eq(op, CRM_OP_RM_NODE_CACHE)) {
         int node_id = 0;
         const char *name = NULL;
diff --git a/include/crm/cib/util.h b/include/crm/cib/util.h
@@ -64,7 +64,6 @@ int query_node_uname(cib_t * the_cib, const char *uuid, char **uname);
 
 int set_standby(cib_t * the_cib, const char *uuid, const char *scope, const char *standby_value);
 
-xmlNode *get_cib_copy(cib_t * cib);
 xmlNode *cib_get_generation(cib_t * cib);
 
 void cib_metadata(void);
diff --git a/include/crm/cluster.h b/include/crm/cluster.h
@@ -53,10 +53,6 @@ enum crm_node_flags
     /* node is not a cluster node and should not be considered for cluster membership */
     crm_remote_node          = 0x0001,
 
-    /* deprecated (not used by cluster) */
-    crm_remote_container     = 0x0002,
-    crm_remote_baremetal     = 0x0004,
-
     /* node's cache entry is dirty */
     crm_node_dirty           = 0x0010,
 };
@@ -134,7 +130,6 @@ int crm_remote_peer_cache_size(void);
 
 /* Initialize and refresh the remote peer cache from a cib config */
 void crm_remote_peer_cache_refresh(xmlNode *cib);
-void crm_remote_peer_cache_add(const char *node_name);
 crm_node_t *crm_remote_peer_get(const char *node_name);
 void crm_remote_peer_cache_remove(const char *node_name);
 
@@ -177,7 +172,6 @@ enum crm_status_type {
     crm_status_uname,
     crm_status_nstate,
     crm_status_processes,
-    crm_status_rstate, /* remote node state */
 };
 
 enum crm_ais_msg_types text2msg_type(const char *text);
diff --git a/include/crm/compatibility.h b/include/crm/compatibility.h
@@ -118,6 +118,7 @@ static int ais_fd_sync = -1;
 #define PE_OBJ_T_GROUP              "group"
 #define PE_OBJ_T_INCARNATION        "clone"
 #define PE_OBJ_T_MASTER             "master"
+#define SERVICE_SCRIPT              "/sbin/service"
 #define SOCKET_LEN                  1024
 #define XML_ATTR_TAGNAME            F_XML_TAGNAME
 #define XML_ATTR_FILTER_TYPE        "type-filter"
@@ -154,7 +155,10 @@ static int ais_fd_sync = -1;
         cib->cmds->register_callback(cib, id, 120, flag, data, #fn, fn); \
     } while(0)
 #define cib_default_options = cib_none
+#define crm_remote_baremetal              0x0004
+#define crm_remote_container              0x0002
 #define n_object_classes 3
+#define pe_action_failure_is_fatal        0x00020
 #define pe_rsc_munging                    0x00000800ULL
 #define pe_rsc_try_reload                 0x00001000ULL
 #define pe_rsc_shutdown                   0x00020000ULL
diff --git a/include/crm/fencing/internal.h b/include/crm/fencing/internal.h
@@ -121,7 +121,6 @@ xmlNode *create_device_registration_xml(const char *id, const char *namespace, c
 #  define STONITH_OP_QUERY       "st_query"
 #  define STONITH_OP_FENCE       "st_fence"
 #  define STONITH_OP_RELAY       "st_relay"
-#  define STONITH_OP_CONFIRM     "st_confirm"
 #  define STONITH_OP_DEVICE_ADD      "st_device_register"
 #  define STONITH_OP_DEVICE_DEL      "st_device_remove"
 #  define STONITH_OP_FENCE_HISTORY   "st_fence_history"
diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
@@ -231,7 +231,6 @@ enum pe_action_flags {
     pe_action_print_always = 0x00008,
 
     pe_action_have_node_attrs = 0x00010,
-    pe_action_failure_is_fatal = 0x00020, /* no longer used, here for API compatibility */
     pe_action_implied_by_stonith = 0x00040,
     pe_action_migrate_runnable =   0x00080,
 
diff --git a/include/crm/services.h b/include/crm/services.h
@@ -48,11 +48,6 @@ extern "C" {
 #    define SYSTEMCTL "/bin/systemctl"
 #  endif
 
-/* Deprecated and unused by Pacemaker, kept for API backward compatibility */
-#  ifndef SERVICE_SCRIPT
-#    define SERVICE_SCRIPT "/sbin/service"
-#  endif
-
 /* Known resource classes */
 #define PCMK_RESOURCE_CLASS_OCF     "ocf"
 #define PCMK_RESOURCE_CLASS_SERVICE "service"
diff --git a/include/crm_internal.h b/include/crm_internal.h
@@ -148,7 +148,6 @@ void crm_make_daemon(const char *name, gboolean daemonize, const char *pidfile);
 /* from operations.c */
 char *generate_op_key(const char *rsc_id, const char *op_type, int interval);
 char *generate_notify_key(const char *rsc_id, const char *notify_type, const char *op_type);
-char *generate_transition_magic_v202(const char *transition_key, int op_status);
 char *generate_transition_magic(const char *transition_key, int op_status, int op_rc);
 char *generate_transition_key(int action, int transition_id, int target_rc, const char *node);
 void filter_action_parameters(xmlNode *param_set, const char *version);
diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
@@ -106,40 +106,6 @@ cib_compare_generation(xmlNode * left, xmlNode * right)
     return 0;
 }
 
-/* Deprecated - doesn't expose -EACCES */
-xmlNode *
-get_cib_copy(cib_t * cib)
-{
-    xmlNode *xml_cib;
-    int options = cib_scope_local | cib_sync_call;
-    int rc = pcmk_ok;
-
-    if (cib->state == cib_disconnected) {
-        return NULL;
-    }
-
-    rc = cib->cmds->query(cib, NULL, &xml_cib, options);
-    if (rc == -EACCES) {
-        return NULL;
-
-    } else if (rc != pcmk_ok) {
-        crm_err("Couldn't retrieve the CIB");
-        free_xml(xml_cib);
-        return NULL;
-
-    } else if (xml_cib == NULL) {
-        crm_err("The CIB result was empty");
-        free_xml(xml_cib);
-        return NULL;
-    }
-
-    if (safe_str_eq(crm_element_name(xml_cib), XML_TAG_CIB)) {
-        return xml_cib;
-    }
-    free_xml(xml_cib);
-    return NULL;
-}
-
 xmlNode *
 cib_get_generation(cib_t * cib)
 {
diff --git a/lib/cluster/membership.c b/lib/cluster/membership.c
@@ -55,8 +55,7 @@ GHashTable *crm_peer_cache = NULL;
  * so it would be a good idea to merge them one day.
  *
  * libcluster provides two avenues for populating the cache:
- * crm_remote_peer_get(), crm_remote_peer_cache_add() and
- * crm_remote_peer_cache_remove() directly manage it,
+ * crm_remote_peer_get() and crm_remote_peer_cache_remove() directly manage it,
  * while crm_remote_peer_cache_refresh() populates it via the CIB.
  */
 GHashTable *crm_remote_peer_cache = NULL;
@@ -125,20 +124,6 @@ crm_remote_peer_get(const char *node_name)
     return node;
 }
 
-/*!
- * \brief Add a node to the remote peer cache
- *
- * \param[in] node_name  Name of remote node
- *
- * \note This is a legacy convenience wrapper for crm_remote_peer_get()
- *       for callers that don't need the cache entry returned.
- */
-void
-crm_remote_peer_cache_add(const char *node_name)
-{
-    CRM_ASSERT(crm_remote_peer_get(node_name) != NULL);
-}
-
 void
 crm_remote_peer_cache_remove(const char *node_name)
 {
@@ -926,15 +911,13 @@ crm_update_peer_state_iter(const char *source, crm_node_t * node, const char *st
 
     if (state && safe_str_neq(node->state, state)) {
         char *last = node->state;
-        enum crm_status_type status_type = is_set(node->flags, crm_remote_node)?
-                                           crm_status_rstate : crm_status_nstate;
 
         node->state = strdup(state);
         crm_notice("Node %s state is now %s " CRM_XS
                    " nodeid=%u previous=%s source=%s", node->uname, state,
                    node->id, (last? last : "unknown"), source);
         if (crm_status_callback) {
-            crm_status_callback(status_type, node, last);
+            crm_status_callback(crm_status_nstate, node, last);
         }
         free(last);
 
diff --git a/lib/common/operations.c b/lib/common/operations.c
@@ -124,13 +124,6 @@ generate_notify_key(const char *rsc_id, const char *notify_type, const char *op_
                              rsc_id, notify_type, op_type);
 }
 
-char *
-generate_transition_magic_v202(const char *transition_key, int op_status)
-{
-    CRM_CHECK(transition_key != NULL, return NULL);
-    return crm_strdup_printf("%d:%s", op_status, transition_key);
-}
-
 char *
 generate_transition_magic(const char *transition_key, int op_status, int op_rc)
 {
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
@@ -2266,8 +2266,6 @@ void pe_action_set_flag_reason(const char *function, long line,
     } else if(is_set(flags, pe_action_optional)) {
         unset = TRUE;
         change = "required";
-    } else if(is_set(flags, pe_action_failure_is_fatal)) {
-        change = "fatally failed";
     } else if(is_set(flags, pe_action_migrate_runnable)) {
         unset = TRUE;
         overwrite = TRUE;
diff --git a/pengine/ptest.c b/pengine/ptest.c
@@ -270,7 +270,8 @@ main(int argc, char **argv)
 
         if (rc == pcmk_ok) {
             crm_info("Reading XML from: live cluster");
-            cib_object = get_cib_copy(cib_conn);
+            rc = cib_conn->cmds->query(cib_conn, NULL, &cib_object,
+                                       cib_scope_local | cib_sync_call);
 
         } else {
             fprintf(stderr, "Live CIB query failed: %s\n", pcmk_strerror(rc));

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ attrd_lookup_or_create_value(GHashTable values, const char host, xmlNode *xml)`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`/* Ensure this host is in the remote peer cache */`
`735`		`- crm_remote_peer_cache_add(host);`
	`735`	`+ CRM_ASSERT(crm_remote_peer_get(host) != NULL);`
`736`	`736`	`}`
`737`	`737`
`738`	`738`	`if (v == NULL) {`
`@@ -966,7 +966,7 @@ attrd_election_cb(gpointer user_data)`
`966`	`966`	`void`
`967`	`967`	`attrd_peer_change_cb(enum crm_status_type kind, crm_node_t peer, const void data)`
`968`	`968`	`{`
`969`		`- if ((kind == crm_status_nstate) \|\| (kind == crm_status_rstate)) {`
	`969`	`+ if (kind == crm_status_nstate) {`
`970`	`970`	`if (safe_str_eq(peer->state, CRM_NODE_MEMBER)) {`
`971`	`971`	`/* If we're the writer, send new peers a list of all attributes`
`972`	`972`	`* (unless it's a remote node, which doesn't run its own attrd)`