Refactor: libcrmcommon: New pcmk__notice()

To replace crm_notice()

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

daemons/attrd/attrd_alerts.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the Pacemaker project contributors
+ * Copyright 2015-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -87,7 +87,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
         crm_debug("Local CIB has no alerts section");
         return;
     } else if (rc != pcmk_ok) {
-        crm_notice("Could not query local CIB: %s", pcmk_strerror(rc));
+        pcmk__notice("Could not query local CIB: %s", pcmk_strerror(rc));
         return;
     }
 
@@ -96,7 +96,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
         crmalerts = pcmk__xe_first_child(crmalerts, PCMK_XE_ALERTS, NULL, NULL);
     }
     if (!crmalerts) {
-        crm_notice("CIB query result has no " PCMK_XE_ALERTS " section");
+        pcmk__notice("CIB query result has no " PCMK_XE_ALERTS " section");
         return;
     }
 

daemons/attrd/attrd_cib.c

@@ -94,8 +94,8 @@ attrd_cib_updated_cb(const char *event, xmlNode *msg)
         if (client_name == NULL) {
             client_name = pcmk__xe_get(msg, PCMK__XA_CIB_CLIENTID);
         }
-        crm_notice("Updating all attributes after %s event triggered by %s",
-                   event, pcmk__s(client_name, "unidentified client"));
+        pcmk__notice("Updating all attributes after %s event triggered by %s",
+                     event, pcmk__s(client_name, "unidentified client"));
 
         attrd_write_attributes(attrd_write_all);
     }
@@ -591,9 +591,9 @@ write_attribute(attribute_t *a, bool ignore_delay)
         // Defer write if this is a cluster node that's never been seen
         if (node_xml_id == NULL) {
             attrd_set_attr_flags(a, attrd_attr_node_unknown);
-            crm_notice("Cannot write %s[%s]='%s' to CIB because node's XML ID "
-                       "is unknown (will retry if learned)",
-                       a->id, v->nodename, v->current);
+            pcmk__notice("Cannot write %s[%s]='%s' to CIB because node's XML "
+                         "ID is unknown (will retry if learned)",
+                         a->id, v->nodename, v->current);
             continue;
         }
 

daemons/attrd/attrd_corosync.c

@@ -261,18 +261,24 @@ update_attr_on_host(attribute_t *a, const pcmk__node_status_t *peer,
          * kept in sync.
          */
         v = g_hash_table_lookup(a->values, attrd_cluster->priv->node_name);
-        crm_notice("%s[%s]: local value '%s' takes priority over '%s' from %s",
-                   attr, host, readable_value(v), value, peer->name);
+        pcmk__notice("%s[%s]: local value '%s' takes priority over '%s' from "
+                     "%s",
+                     attr, host, readable_value(v), value, peer->name);
         attrd_broadcast_value(a, v);
 
     } else if (changed) {
-        crm_notice("Setting %s[%s]%s%s: %s -> %s "
-                   QB_XS " from %s with %s write delay and node XML ID %s",
-                   attr, host, a->set_type ? " in " : "",
-                   pcmk__s(a->set_type, ""), readable_value(v),
-                   pcmk__s(value, "(unset)"), peer->name,
-                   (a->timeout_ms == 0)? "no" : pcmk__readable_interval(a->timeout_ms),
-                   pcmk__s(node_xml_id, "unknown"));
+        const char *timeout_s = "no";
+
+        if (a->timeout_ms != 0) {
+            timeout_s = pcmk__readable_interval(a->timeout_ms);
+        }
+
+        pcmk__notice("Setting %s[%s]%s%s: %s -> %s "
+                     QB_XS " from %s with %s write delay and node XML ID %s",
+                     attr, host, ((a->set_type != NULL)? " in " : ""),
+                     pcmk__s(a->set_type, ""), readable_value(v),
+                     pcmk__s(value, "(unset)"), peer->name, timeout_s,
+                     pcmk__s(node_xml_id, "unknown"));
         pcmk__str_update(&v->current, value);
         attrd_set_attr_flags(a, attrd_attr_changed);
 
@@ -528,9 +534,9 @@ attrd_peer_remove(const char *host, bool uncache, const char *source)
     GHashTableIter aIter;
 
     CRM_CHECK(host != NULL, return);
-    crm_notice("Removing all %s attributes for node %s "
-               QB_XS " %s reaping node from cache",
-               host, source, (uncache? "and" : "without"));
+    pcmk__notice("Removing all %s attributes for node %s "
+                 QB_XS " %s reaping node from cache",
+                 host, source, (uncache? "and" : "without"));
 
     g_hash_table_iter_init(&aIter, attributes);
     while (g_hash_table_iter_next(&aIter, NULL, (gpointer *) & a)) {

daemons/attrd/attrd_elections.c

@@ -113,14 +113,14 @@ attrd_check_for_new_writer(const pcmk__node_status_t *peer, const xmlNode *xml)
         if ((election_state(attrd_cluster) == election_won)
             && !pcmk__str_eq(peer->name, attrd_cluster->priv->node_name,
                              pcmk__str_casei)) {
-            crm_notice("Detected another attribute writer (%s), starting new "
-                       "election",
-                       peer->name);
+            pcmk__notice("Detected another attribute writer (%s), starting new "
+                         "election",
+                         peer->name);
             election_vote(attrd_cluster);
 
         } else if (!pcmk__str_eq(peer->name, peer_writer, pcmk__str_casei)) {
-            crm_notice("Recorded new attribute writer: %s (was %s)",
-                       peer->name, pcmk__s(peer_writer, "unset"));
+            pcmk__notice("Recorded new attribute writer: %s (was %s)",
+                         peer->name, pcmk__s(peer_writer, "unset"));
             pcmk__str_update(&peer_writer, peer->name);
         }
     }
@@ -130,8 +130,8 @@ attrd_check_for_new_writer(const pcmk__node_status_t *peer, const xmlNode *xml)
 void
 attrd_declare_winner(void)
 {
-    crm_notice("Recorded local node as attribute writer (was %s)",
-               (peer_writer? peer_writer : "unset"));
+    pcmk__notice("Recorded local node as attribute writer (was %s)",
+                 pcmk__s(peer_writer, "unset"));
     pcmk__str_update(&peer_writer, attrd_cluster->priv->node_name);
 }
 
@@ -144,7 +144,7 @@ attrd_remove_voter(const pcmk__node_status_t *peer)
 
         free(peer_writer);
         peer_writer = NULL;
-        crm_notice("Lost attribute writer %s", peer->name);
+        pcmk__notice("Lost attribute writer %s", peer->name);
 
         /* Clear any election dampening in effect. Otherwise, if the lost writer
          * had just won, the election could fizzle out with no new writer.

daemons/attrd/attrd_sync.c

@@ -254,8 +254,8 @@ attrd_ack_waitlist_clients(enum attrd_sync_point sync_point, const xmlNode *xml)
             return;
         }
 
-        crm_notice("Alerting client %s for reached %s sync point",
-                   wl->client_id, sync_point_str(wl->sync_point));
+        pcmk__notice("Alerting client %s for reached %s sync point",
+                     wl->client_id, sync_point_str(wl->sync_point));
 
         client = pcmk__find_client_by_id(wl->client_id);
         if (client == NULL) {

daemons/attrd/pacemaker-attrd.c

@@ -134,8 +134,8 @@ main(int argc, char **argv)
     pcmk__add_logfiles(log_files, out);
 
     crm_log_init(PCMK__VALUE_ATTRD, LOG_INFO, TRUE, FALSE, argc, argv, FALSE);
-    crm_notice("Starting Pacemaker node attribute manager%s",
-               stand_alone ? " in standalone mode" : "");
+    pcmk__notice("Starting Pacemaker node attribute manager%s",
+                 (stand_alone ? " in standalone mode" : ""));
 
     if (ipc_already_running()) {
         attrd_exit_status = CRM_EX_OK;
@@ -187,7 +187,8 @@ main(int argc, char **argv)
     attrd_broadcast_protocol();
 
     attrd_init_ipc();
-    crm_notice("Pacemaker node attribute manager successfully started and accepting connections");
+    pcmk__notice("Pacemaker node attribute manager successfully started and "
+                 "accepting connections");
     attrd_run_mainloop();
 
   done:

daemons/based/based_callbacks.c

@@ -456,15 +456,16 @@ process_ping_reply(xmlNode *reply)
                 num_updates_s = pcmk__xe_get(remote_cib, PCMK_XA_NUM_UPDATES);
             }
 
-            crm_notice("Local CIB %s.%s.%s.%s differs from %s: %s.%s.%s.%s %p",
-                       pcmk__xe_get(the_cib, PCMK_XA_ADMIN_EPOCH),
-                       pcmk__xe_get(the_cib, PCMK_XA_EPOCH),
-                       pcmk__xe_get(the_cib, PCMK_XA_NUM_UPDATES),
-                       ping_digest, host,
-                       pcmk__s(admin_epoch_s, "_"),
-                       pcmk__s(epoch_s, "_"),
-                       pcmk__s(num_updates_s, "_"),
-                       digest, remote_cib);
+            pcmk__notice("Local CIB %s.%s.%s.%s differs from %s: %s.%s.%s.%s "
+                         "%p",
+                         pcmk__xe_get(the_cib, PCMK_XA_ADMIN_EPOCH),
+                         pcmk__xe_get(the_cib, PCMK_XA_EPOCH),
+                         pcmk__xe_get(the_cib, PCMK_XA_NUM_UPDATES),
+                         ping_digest, host,
+                         pcmk__s(admin_epoch_s, "_"),
+                         pcmk__s(epoch_s, "_"),
+                         pcmk__s(num_updates_s, "_"),
+                         digest, remote_cib);
 
             if(remote_cib && remote_cib->children) {
                 // Additional debug
@@ -1233,8 +1234,8 @@ cib_peer_callback(xmlNode * msg, void *private_data)
 static gboolean
 cib_force_exit(gpointer data)
 {
-    crm_notice("Exiting immediately after %s without shutdown acknowledgment",
-               pcmk__readable_interval(EXIT_ESCALATION_MS));
+    pcmk__notice("Exiting immediately after %s without shutdown acknowledgment",
+                 pcmk__readable_interval(EXIT_ESCALATION_MS));
     terminate_cib(CRM_EX_ERROR);
     return FALSE;
 }

daemons/based/based_io.c

@@ -203,8 +203,9 @@ readCibXmlFile(const char *dir, const char *file, gboolean discard_status)
 
         rc = cib_file_read_and_verify(filename, sigfile, &root);
         if (rc == pcmk_ok) {
-            crm_notice("Loaded CIB from last valid backup %s (with digest %s)",
-                       filename, sigfile);
+            pcmk__notice("Loaded CIB from last valid backup %s (with digest "
+                         "%s)",
+                         filename, sigfile);
         } else {
             pcmk__warn("Not using next most recent CIB backup from %s (with "
                        "digest %s): %s",

daemons/based/based_messages.c

@@ -231,7 +231,7 @@ cib_process_upgrade_server(const char *op, int options, const char *section, xml
             xmlNode *up = pcmk__xe_create(NULL, __func__);
 
             rc = pcmk_ok;
-            crm_notice("Upgrade request from %s verified", host);
+            pcmk__notice("Upgrade request from %s verified", host);
 
             pcmk__xe_set(up, PCMK__XA_T, PCMK__VALUE_CIB);
             pcmk__xe_set(up, PCMK__XA_CIB_OP, PCMK__CIB_REQUEST_UPGRADE);
@@ -319,9 +319,10 @@ cib_server_process_diff(const char *op, int options, const char *section, xmlNod
                                  &diff_del_admin_epoch, &diff_del_epoch, &diff_del_updates);
 
         sync_in_progress++;
-        crm_notice("Not applying diff %d.%d.%d -> %d.%d.%d (sync in progress)",
-                   diff_del_admin_epoch, diff_del_epoch, diff_del_updates,
-                   diff_add_admin_epoch, diff_add_epoch, diff_add_updates);
+        pcmk__notice("Not applying diff %d.%d.%d -> %d.%d.%d (sync in "
+                     "progress)",
+                     diff_del_admin_epoch, diff_del_epoch, diff_del_updates,
+                     diff_add_admin_epoch, diff_add_epoch, diff_add_updates);
         return -pcmk_err_diff_resync;
     }
 

daemons/based/based_notify.c

@@ -117,8 +117,8 @@ cib_notify_send(const xmlNode *xml)
         pcmk__foreach_ipc_client(cib_notify_send_one, &update);
 
     } else {
-        crm_notice("Could not notify clients: %s " QB_XS " rc=%d",
-                   pcmk_rc_str(rc), rc);
+        pcmk__notice("Could not notify clients: %s " QB_XS " rc=%d",
+                     pcmk_rc_str(rc), rc);
     }
     pcmk_free_ipc_event(iov);
 }