---
src/clm/clmd/clms_evt.cc | 20 ++++++++++----------
src/clm/clmd/clms_imm.cc | 2 +-
src/clm/clmd/clms_main.cc | 2 +-
src/clm/clmd/clms_mbcsv.cc | 4 ++--
src/clm/clmd/clms_mds.cc | 6 +++---
src/clm/clmd/clms_util.cc | 8 ++++----
src/clm/clmnd/main.cc | 2 +-
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/clm/clmd/clms_evt.cc b/src/clm/clmd/clms_evt.cc
index e8577060e..302c8680b 100644
--- a/src/clm/clmd/clms_evt.cc
+++ b/src/clm/clmd/clms_evt.cc
@@ -588,7 +588,7 @@ uint32_t proc_node_up_msg(CLMS_CB *cb, CLMSV_CLMS_EVT *evt)
{
/* Retrieve IP information */
if (ip == nullptr) {
clm_msg.info.api_resp_info.rc = SA_AIS_ERR_NOT_EXIST;
- LOG_ER("IP information not found for: %s with node_id: %u",
+ LOG_ER("IP information not found for: %s with node_id: %x",
nodeup_info->node_name.value, nodeid);
} else {
if (ip->addr.length) { /* If length = 0, it is AF_TIPC. So
@@ -668,7 +668,7 @@ uint32_t proc_node_up_msg(CLMS_CB *cb, CLMSV_CLMS_EVT *evt)
{
if (nullptr == clms_node_get_by_id(nodeid)) {
node->node_id = nodeup_info->node_id;
- TRACE("node->node_id %u node->nodeup %d", node->node_id, node->nodeup);
+ TRACE("node->node_id %x node->nodeup %d", node->node_id, node->nodeup);
if (clms_node_add(node, 0) != NCSCC_RC_SUCCESS) {
LOG_ER("Patricia tree add failed:crosscheck " PKGSYSCONFDIR
@@ -953,7 +953,7 @@ static uint32_t proc_mds_node_evt(CLMSV_CLMS_EVT *evt) {
node = clms_node_get_by_id(node_id);
if (node == nullptr) {
- LOG_IN("Node %d doesn't exist", node_id);
+ LOG_IN("Node %x doesn't exist", node_id);
rc = NCSCC_RC_FAILURE;
goto done;
}
@@ -980,7 +980,7 @@ static uint32_t proc_mds_node_evt(CLMSV_CLMS_EVT *evt) {
TRACE_LEAVE();
return rc;
} else {
- TRACE("Adding the node_down record for node: %u to the list", node_id);
+ TRACE("Adding the node_down record for node: %x to the list", node_id);
NODE_DOWN_LIST *node_down_rec = nullptr;
if (nullptr ==
(node_down_rec = (NODE_DOWN_LIST *)malloc(sizeof(NODE_DOWN_LIST)))) {
@@ -1221,7 +1221,7 @@ static uint32_t proc_track_start_msg(CLMS_CB *cb,
CLMSV_CLMS_EVT *evt) {
TRACE_ENTER();
node = clms_node_get_by_id(node_id);
- TRACE("Node id = %d", node_id);
+ TRACE("Node id = %x", node_id);
if (node == nullptr) {
TRACE("Client is tracking on an unconfigured node");
ais_rc = SA_AIS_ERR_UNAVAILABLE;
@@ -1324,9 +1324,9 @@ static uint32_t proc_track_stop_msg(CLMS_CB *cb,
CLMSV_CLMS_EVT *evt) {
TRACE_ENTER();
node = clms_node_get_by_id(node_id);
- TRACE("Node id = %d", node_id);
+ TRACE("Node id = %x", node_id);
if (node == nullptr) {
- LOG_IN("Client tracking on an unconfigured node:nodeid = %d", node_id);
+ LOG_IN("Client tracking on an unconfigured node:nodeid = %x", node_id);
ais_rc = SA_AIS_ERR_UNAVAILABLE;
goto snd_rsp;
}
@@ -1549,7 +1549,7 @@ static uint32_t proc_initialize_msg(CLMS_CB *cb,
CLMSV_CLMS_EVT *evt) {
TRACE_ENTER2("dest %" PRIx64, evt->fr_dest);
node = clms_node_get_by_id(node_id);
- TRACE("Node id = %d", node_id);
+ TRACE("Node id = %x", node_id);
if (node == nullptr) {
ais_rc = SA_AIS_ERR_UNAVAILABLE;
std::set<SaUint32T>::iterator it =
@@ -1557,7 +1557,7 @@ static uint32_t proc_initialize_msg(CLMS_CB *cb,
CLMSV_CLMS_EVT *evt) {
if (it != clms_cb->mds_node_down_list.end()) {
return (uint32_t)ais_rc;
}
- LOG_IN("Initialize request of client on an unconfigured node: node_id =
%d",
+ LOG_IN("Initialize request of client on an unconfigured node: node_id =
%x",
node_id);
}
@@ -2100,7 +2100,7 @@ void clms_remove_node_down_rec(SaClmNodeIdT node_id) {
}
if (!record_found) {
- TRACE("MDS node down for: %u not yet reached. Adding to the list",
node_id);
+ TRACE("MDS node down for: %x not yet reached. Adding to the list",
node_id);
/* MDS node_down has not yet reached the STANDBY,
* Just add this checkupdate record to the list. MDS_DOWN
* processing will delete it. If role change happens before
diff --git a/src/clm/clmd/clms_imm.cc b/src/clm/clmd/clms_imm.cc
index 46b045faa..b7de61c4c 100644
--- a/src/clm/clmd/clms_imm.cc
+++ b/src/clm/clmd/clms_imm.cc
@@ -1389,7 +1389,7 @@ void clms_send_track(CLMS_CB *cb, CLMS_CLUSTER_NODE *node,
*/
if ((node_id == node->node_id) && (node_reboot)) {
LOG_NO(
- "Node %u went down. Not sending track callback for agents on
that node",
+ "Node %x went down. Not sending track callback for agents on
that node",
node_id);
} else {
rc = clms_prep_and_send_track(
diff --git a/src/clm/clmd/clms_main.cc b/src/clm/clmd/clms_main.cc
index ad6e12ea5..1b4589330 100644
--- a/src/clm/clmd/clms_main.cc
+++ b/src/clm/clmd/clms_main.cc
@@ -636,7 +636,7 @@ void clms_cb_dump() {
memcpy(&nodename, &node->node_name, sizeof(SaNameT));
TRACE("Dump Runtime data of the node: %s", node->node_name.value);
TRACE("Membership status %d", node->member);
- TRACE("Node Id %u", node->node_id);
+ TRACE("Node Id %x", node->node_id);
TRACE("Init_view %llu", node->init_view);
TRACE("Admin_state %d", node->admin_state);
TRACE("Change %d", node->change);
diff --git a/src/clm/clmd/clms_mbcsv.cc b/src/clm/clmd/clms_mbcsv.cc
index f01d9c590..695d0a794 100644
--- a/src/clm/clmd/clms_mbcsv.cc
+++ b/src/clm/clmd/clms_mbcsv.cc
@@ -489,7 +489,7 @@ static uint32_t ckpt_proc_node_rec(CLMS_CB *cb,
CLMS_CKPT_REC *data) {
CLMS_CLUSTER_NODE *node = nullptr;
IPLIST *ip = nullptr;
- TRACE_ENTER2("node_id %u", param->node_id);
+ TRACE_ENTER2("node_id %x", param->node_id);
node = clms_node_get_by_name(¶m->node_name);
@@ -524,7 +524,7 @@ static uint32_t ckpt_proc_node_rec(CLMS_CB *cb,
CLMS_CKPT_REC *data) {
/* Update the node with ipaddress information */
if ((ip = (IPLIST *)ncs_patricia_tree_get(
&clms_cb->iplist, (uint8_t *)&node->node_id)) == nullptr) {
- LOG_NO("IP information not found for: %u", node->node_id);
+ LOG_NO("IP information not found for: %x", node->node_id);
} else {
if (ip->addr.length) {
node->node_addr.family = ip->addr.family;
diff --git a/src/clm/clmd/clms_mds.cc b/src/clm/clmd/clms_mds.cc
index 45d1453e4..24b5bcd71 100644
--- a/src/clm/clmd/clms_mds.cc
+++ b/src/clm/clmd/clms_mds.cc
@@ -1005,7 +1005,7 @@ static uint32_t clms_mds_node_event(struct
ncsmds_callback_info *mds_info) {
IPLIST *ip = nullptr;
TRACE_ENTER();
- TRACE("node_id %d,nodeup %d", mds_info->info.node_evt.node_id,
+ TRACE("node_id %x,nodeup %d", mds_info->info.node_evt.node_id,
mds_info->info.node_evt.node_chg);
/* Send the message to clms */
@@ -1030,7 +1030,7 @@ static uint32_t clms_mds_node_event(struct
ncsmds_callback_info *mds_info) {
if ((ip = (IPLIST *)ncs_patricia_tree_get(
&clms_cb->iplist, (uint8_t *)&node_id)) == nullptr) {
IPLIST *ip = (IPLIST *)calloc(1, sizeof(IPLIST));
- TRACE("node_id: %u not found, adding as a new node", ip->node_id);
+ TRACE("node_id: %x not found, adding as a new node", ip->node_id);
ip->node_id = mds_info->info.node_evt.node_id;
ip->pat_node_id.key_info = (uint8_t *)&(ip->node_id);
if (mds_info->info.node_evt.addr_family == OSAF_AF_TIPC) {
@@ -1057,7 +1057,7 @@ static uint32_t clms_mds_node_event(struct
ncsmds_callback_info *mds_info) {
}
if (ncs_patricia_tree_add(&clms_cb->iplist, &ip->pat_node_id) !=
NCSCC_RC_SUCCESS)
- TRACE("node add failed for node_id: %u", ip->node_id);
+ TRACE("node add failed for node_id: %x", ip->node_id);
} else {
ip->node_id = mds_info->info.node_evt.node_id;
if (mds_info->info.node_evt.addr_family == OSAF_AF_TIPC) {
diff --git a/src/clm/clmd/clms_util.cc b/src/clm/clmd/clms_util.cc
index 4b2dd19e2..efd4a200a 100644
--- a/src/clm/clmd/clms_util.cc
+++ b/src/clm/clmd/clms_util.cc
@@ -125,7 +125,7 @@ CLMS_CLUSTER_NODE *clms_node_get_by_id(SaUint32T nodeid) {
(((char *)&(
((CLMS_CLUSTER_NODE *)0)->pat_node_id)) -
((char *)((CLMS_CLUSTER_NODE *)0))));
- TRACE("Node found %d", node->node_id);
+ TRACE("Node found %x", node->node_id);
}
TRACE_LEAVE();
@@ -153,7 +153,7 @@ CLMS_CLUSTER_NODE *clms_node_getnext_by_id(SaUint32T
node_id) {
(((char *)&(
((CLMS_CLUSTER_NODE *)0)->pat_node_id)) -
((char *)((CLMS_CLUSTER_NODE *)0))));
- TRACE("Node found %d", node->node_id);
+ TRACE("Node found %x", node->node_id);
}
return node;
@@ -171,12 +171,12 @@ uint32_t clms_node_add(CLMS_CLUSTER_NODE *node, int i) {
TRACE("value of i %d", i);
switch (i) {
case 0:
- TRACE("Adding node_id to the patricia tree with node_id %u as key",
+ TRACE("Adding node_id to the patricia tree with node_id %x as key",
node->node_id);
node->pat_node_id.key_info = (uint8_t *)&(node->node_id);
rc = ncs_patricia_tree_add(&clms_cb->id_lookup, &node->pat_node_id);
if (rc != NCSCC_RC_SUCCESS) {
- LOG_WA("ncs_patricia_tree_add for node_id FAILED for '%d' %u",
+ LOG_WA("ncs_patricia_tree_add for node_id FAILED for '%x' %u",
node->node_id, rc);
node->pat_node_id.key_info = nullptr;
goto done;
diff --git a/src/clm/clmnd/main.cc b/src/clm/clmnd/main.cc
index 09857fcc7..9340225cb 100644
--- a/src/clm/clmnd/main.cc
+++ b/src/clm/clmnd/main.cc
@@ -135,7 +135,7 @@ static uint32_t clmna_mds_dec(struct ncsmds_callback_info
*info) {
LOG_IN("Node will be rebooted");
osaf_safe_reboot();
} else {
- LOG_IN("Node %u is going to be rebooted",
+ LOG_IN("Node %x is going to be rebooted",
msg->info.reboot_info.node_id);
}
break;
--
2.25.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
