---
src/amf/amfd/ckpt_dec.cc | 2 +-
src/amf/amfd/clm.cc | 6 +++---
src/amf/amfd/ndfsm.cc | 6 +++---
src/amf/amfd/ndproc.cc | 8 ++++----
src/amf/amfd/node.cc | 2 +-
src/amf/amfd/pg.cc | 4 ++--
src/amf/amfd/role.cc | 4 ++--
src/amf/amfd/sgproc.cc | 4 ++--
src/amf/amfd/siass.cc | 2 +-
src/amf/amfd/su.cc | 2 +-
src/amf/amfnd/amfnd.cc | 2 +-
src/amf/amfnd/cbq.cc | 2 +-
src/amf/amfnd/clm.cc | 6 +++---
src/amf/amfnd/comp.cc | 4 ++--
src/amf/amfnd/di.cc | 4 ++--
src/amf/amfnd/imm.cc | 2 +-
src/amf/amfnd/proxy.cc | 16 ++++++++--------
src/amf/amfnd/proxydb.cc | 16 ++++++++--------
18 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/amf/amfd/ckpt_dec.cc b/src/amf/amfd/ckpt_dec.cc
index 3ec1e516b..f95c6e6c0 100644
--- a/src/amf/amfd/ckpt_dec.cc
+++ b/src/amf/amfd/ckpt_dec.cc
@@ -194,7 +194,7 @@ void set_node_failover_state(AVD_CL_CB *cb, const
SaClmNodeIdT node_id,
if (failed_node != cb->failover_list.end()) {
failed_node->second->SetState(state);
} else {
- LOG_NO("Node '%u' not found in failover_list. Create new entry",
+ LOG_NO("Node '%x' not found in failover_list. Create new entry",
node_id);
auto new_node = std::make_shared<NodeStateMachine>(cb, node_id);
// node must be added to failover_list before SetState() is called.
diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc
index 620ce2853..f8a931aba 100644
--- a/src/amf/amfd/clm.cc
+++ b/src/amf/amfd/clm.cc
@@ -93,7 +93,7 @@ static void clm_node_exit_validate(AVD_AVND *node) {
*/
if (node->node_info.nodeId == avd_cb->node_id_avd) {
reject = true;
- LOG_NO("Validate Step on Active Controller %d", avd_cb->node_id_avd);
+ LOG_NO("Validate Step on Active Controller %x", avd_cb->node_id_avd);
goto done;
}
@@ -286,7 +286,7 @@ static void clm_track_cb(
"safHE=",
sizeof("safHE=") - 1) == 0) {
// PLM will take care of calling opensafd stop
- TRACE("rootCause: %s from PLM operation so skipping %u",
+ TRACE("rootCause: %s from PLM operation so skipping %x",
osaf_extended_name_borrow(rootCauseEntity),
notifItem->clusterNode.nodeId);
@@ -328,7 +328,7 @@ static void clm_track_cb(
}
goto done;
}
- TRACE(" Node Left: rootCauseEntity %s for node %u",
+ TRACE(" Node Left: rootCauseEntity %s for node %x",
osaf_extended_name_borrow(rootCauseEntity),
notifItem->clusterNode.nodeId);
if (strncmp(osaf_extended_name_borrow(rootCauseEntity),
diff --git a/src/amf/amfd/ndfsm.cc b/src/amf/amfd/ndfsm.cc
index be7db7a3e..05c103e12 100644
--- a/src/amf/amfd/ndfsm.cc
+++ b/src/amf/amfd/ndfsm.cc
@@ -505,7 +505,7 @@ void avd_node_up_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
}
if (avd_snd_su_reg_msg(cb, avnd, false) != NCSCC_RC_SUCCESS) {
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, avnd->node_info.nodeId);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, avnd->node_info.nodeId);
/* we are in a bad shape. Restart the node for recovery */
/* call the routine to failover all the effected nodes
@@ -582,7 +582,7 @@ void avd_node_down_evh(AVD_CL_CB *cb, AVD_EVT *evt)
if (avd_snd_node_ack_msg(cb, node,
n2d_msg->msg_info.n2d_node_down_info.msg_id) != NCSCC_RC_SUCCESS) {
/* log error that the director is not able to send the message */
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, node->node_info.nodeId);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, node->node_info.nodeId);
goto done;
}
cb->avd_imm_status = AVD_IMM_TERMINATING;
@@ -1144,7 +1144,7 @@ uint32_t avd_node_down(AVD_CL_CB *cb, SaClmNodeIdT
node_id) {
if ((avnd = avd_node_find_nodeid(node_id)) == nullptr) {
/* log error that the node id is invalid */
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, node_id);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, node_id);
return NCSCC_RC_FAILURE;
}
diff --git a/src/amf/amfd/ndproc.cc b/src/amf/amfd/ndproc.cc
index 29c574167..feebfebba 100644
--- a/src/amf/amfd/ndproc.cc
+++ b/src/amf/amfd/ndproc.cc
@@ -132,7 +132,7 @@ void avd_reg_su_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
if ((node->node_state == AVD_AVND_STATE_ABSENT) ||
(node->node_state == AVD_AVND_STATE_GO_DOWN)) {
- LOG_ER("%s: invalid node state %u for node id '%u'", __FUNCTION__,
+ LOG_ER("%s: invalid node state %u for node id '%x'", __FUNCTION__,
node->node_state, n2d_msg->msg_info.n2d_reg_su.node_id);
avsv_dnd_msg_free(n2d_msg);
evt->info.avnd_msg = nullptr;
@@ -280,7 +280,7 @@ void avd_oper_req_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
if ((node->node_state == AVD_AVND_STATE_ABSENT) ||
(node->node_state == AVD_AVND_STATE_GO_DOWN)) {
- LOG_ER("%s: invalid node state %u for node id '%u'", __FUNCTION__,
+ LOG_ER("%s: invalid node state %u for node id '%x'", __FUNCTION__,
node->node_state, n2d_msg->msg_info.n2d_op_req.node_id);
goto done;
}
@@ -879,7 +879,7 @@ void avd_data_update_req_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
*/
if (avd_snd_node_ack_msg(cb, node, node->rcv_msg_id) != NCSCC_RC_SUCCESS) {
/* log error that the director is not able to send the message */
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, node->node_info.nodeId);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, node->node_info.nodeId);
}
/* Verify that operation is only modification. */
@@ -1225,7 +1225,7 @@ void avd_comp_validation_evh(AVD_CL_CB *cb, AVD_EVT *evt)
{
if ((node->node_state == AVD_AVND_STATE_ABSENT) ||
(node->node_state == AVD_AVND_STATE_GO_DOWN)) {
- LOG_ER("%s: invalid node state %u for node id '%u'", __FUNCTION__,
+ LOG_ER("%s: invalid node state %u for node id '%x'", __FUNCTION__,
node->node_state, valid_info->node_id);
avsv_dnd_msg_free(n2d_msg);
evt->info.avnd_msg = nullptr;
diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc
index 4c63055f8..a78cdc08f 100644
--- a/src/amf/amfd/node.cc
+++ b/src/amf/amfd/node.cc
@@ -50,7 +50,7 @@ bool NodeNameCompare::operator()(const AVD_AVND *lhs, const
AVD_AVND *rhs) {
uint32_t avd_node_add_nodeid(AVD_AVND *node) {
if ((node_id_db->find(node->node_info.nodeId) == nullptr) &&
(node->node_info.nodeId != 0)) {
- TRACE("added node %d", node->node_info.nodeId);
+ TRACE("added node %x", node->node_info.nodeId);
unsigned int rc = node_id_db->insert(node->node_info.nodeId, node);
osafassert(rc == NCSCC_RC_SUCCESS);
}
diff --git a/src/amf/amfd/pg.cc b/src/amf/amfd/pg.cc
index 4d1a29229..25e6f442a 100644
--- a/src/amf/amfd/pg.cc
+++ b/src/amf/amfd/pg.cc
@@ -78,7 +78,7 @@ void avd_pg_trk_act_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
if ((node->node_state == AVD_AVND_STATE_ABSENT) ||
(node->node_state == AVD_AVND_STATE_GO_DOWN)) {
- LOG_ER("%s: invalid node state %u for node id '%u'", __FUNCTION__,
+ LOG_ER("%s: invalid node state %u for node id '%x'", __FUNCTION__,
node->node_state, info->node_id);
goto done;
}
@@ -106,7 +106,7 @@ void avd_pg_trk_act_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
/* send back the response */
if (NCSCC_RC_SUCCESS != avd_snd_pg_resp_msg(cb, node, csi, info))
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, node->node_info.nodeId);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, node->node_info.nodeId);
done:
avsv_dnd_msg_free(evt->info.avnd_msg);
diff --git a/src/amf/amfd/role.cc b/src/amf/amfd/role.cc
index f08007adf..f74bd689f 100644
--- a/src/amf/amfd/role.cc
+++ b/src/amf/amfd/role.cc
@@ -702,7 +702,7 @@ void avd_role_switch_ncs_su_evh(AVD_CL_CB *cb, AVD_EVT
*evt) {
/* get the avnd from node_id */
if (nullptr == (avnd = avd_node_find_nodeid(cb->node_id_avd))) {
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, cb->node_id_avd);
return;
}
other_avnd = avd_node_find_nodeid(cb->node_id_avd_other);
@@ -858,7 +858,7 @@ try_again:
/* Now Dispatch all the messages from the MBCSv mail-box */
if (NCSCC_RC_SUCCESS != (rc = avsv_mbcsv_dispatch(cb, SA_DISPATCH_ALL))) {
- LOG_ER("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd_other);
+ LOG_ER("%s:%u: %x", __FILE__, __LINE__, cb->node_id_avd_other);
cb->swap_switch = false;
return;
}
diff --git a/src/amf/amfd/sgproc.cc b/src/amf/amfd/sgproc.cc
index 7de64f4a8..4da8e8b40 100644
--- a/src/amf/amfd/sgproc.cc
+++ b/src/amf/amfd/sgproc.cc
@@ -744,7 +744,7 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
if ((node->node_state == AVD_AVND_STATE_ABSENT) ||
(node->node_state == AVD_AVND_STATE_GO_DOWN)) {
- LOG_ER("%s: invalid node state %u for node id '%u'", __FUNCTION__,
+ LOG_ER("%s: invalid node state %u for node id '%x'", __FUNCTION__,
node->node_state, n2d_msg->msg_info.n2d_opr_state.node_id);
goto done;
}
@@ -1263,7 +1263,7 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
if ((node->node_state == AVD_AVND_STATE_ABSENT) ||
(node->node_state == AVD_AVND_STATE_GO_DOWN)) {
- LOG_ER("%s: invalid node state %u for node id '%u'", __FUNCTION__,
+ LOG_ER("%s: invalid node state %u for node id '%x'", __FUNCTION__,
node->node_state, n2d_msg->msg_info.n2d_su_si_assign.node_id);
goto done;
}
diff --git a/src/amf/amfd/siass.cc b/src/amf/amfd/siass.cc
index 08256a441..a12ad0580 100644
--- a/src/amf/amfd/siass.cc
+++ b/src/amf/amfd/siass.cc
@@ -1214,7 +1214,7 @@ done:
* @return SA_AIS_OK when OK
*/
SaAisErrorT avd_susi_recreate(AVSV_N2D_ND_SISU_STATE_MSG_INFO *info) {
- TRACE_ENTER2("msg_id: %u node_id: %u num_sisu: %u", info->msg_id,
+ TRACE_ENTER2("msg_id: %u node_id: %x num_sisu: %u", info->msg_id,
info->node_id, info->num_sisu);
AVD_SU_SI_REL *susi = nullptr;
diff --git a/src/amf/amfd/su.cc b/src/amf/amfd/su.cc
index 1fe92c16b..81cfbf727 100644
--- a/src/amf/amfd/su.cc
+++ b/src/amf/amfd/su.cc
@@ -645,7 +645,7 @@ static void su_add_to_model(AVD_SU *su) {
LOG_ER("%s: avd_node_find_nodeid failed %x", __FUNCTION__,
avd_cb->node_id_avd);
avd_sg_remove_su(su);
- LOG_ER("Avnd Lookup failure, node id %u", avd_cb->node_id_avd);
+ LOG_ER("Avnd Lookup failure, node id %x", avd_cb->node_id_avd);
}
}
diff --git a/src/amf/amfnd/amfnd.cc b/src/amf/amfnd/amfnd.cc
index 7b7a1aeed..d861e665c 100644
--- a/src/amf/amfnd/amfnd.cc
+++ b/src/amf/amfnd/amfnd.cc
@@ -419,7 +419,7 @@ uint32_t avnd_evt_avd_reboot_evh(AVND_CB *cb, AVND_EVT
*evt) {
AVSV_D2N_REBOOT_MSG_INFO *info;
info = &evt->info.avd->msg_info.d2n_reboot_info;
- TRACE_ENTER2("%u, %u", info->node_id, info->msg_id);
+ TRACE_ENTER2("%x, %u", info->node_id, info->msg_id);
osafassert(AVSV_D2N_REBOOT_MSG == evt->info.avd->msg_type);
diff --git a/src/amf/amfnd/cbq.cc b/src/amf/amfnd/cbq.cc
index dff312334..72465eb5d 100644
--- a/src/amf/amfnd/cbq.cc
+++ b/src/amf/amfnd/cbq.cc
@@ -859,7 +859,7 @@ uint32_t avnd_comp_cbq_rec_send(AVND_CB *cb, AVND_COMP
*comp,
i_to_dest = avnd_get_mds_dest_from_nodeid(cb, node_id);
rc = avnd_avnd_mds_send(cb, i_to_dest, &msg);
if (NCSCC_RC_SUCCESS != rc) {
- LOG_ER("avnd_comp_cbq_rec_send:Msg Send to AvND Failed:%s, %u",
+ LOG_ER("avnd_comp_cbq_rec_send:Msg Send to AvND Failed:%s, %x",
comp->name.c_str(), node_id);
}
} else {
diff --git a/src/amf/amfnd/clm.cc b/src/amf/amfnd/clm.cc
index 27b6e171d..b8d289fdb 100644
--- a/src/amf/amfnd/clm.cc
+++ b/src/amf/amfnd/clm.cc
@@ -48,7 +48,7 @@ static void clm_node_left(SaClmNodeIdT node_id) {
AVND_COMP_PXIED_REC *pxd_rec = 0, *curr_rec = 0;
std::string name = "";
- TRACE_ENTER2("%u", node_id);
+ TRACE_ENTER2("%x", node_id);
if ((node_id == avnd_cb->node_info.nodeId) &&
(avnd_cb->node_info.member == SA_TRUE)) {
@@ -68,7 +68,7 @@ static void clm_node_left(SaClmNodeIdT node_id) {
AVND_COMP *comp = nullptr;
uint32_t rc;
std::string name = "";
- LOG_NO("Node Id:'%d'", node_id);
+ LOG_NO("Node Id:'%x'", node_id);
// Delete the responses, which was expected to come from this node.
while (nullptr != (comp =
avnd_compdb_rec_get_next(avnd_cb->compdb_internode, name))) {
@@ -248,7 +248,7 @@ static void clm_track_cb(
(notifItem->clusterChange == SA_CLM_NODE_SHUTDOWN)) {
TRACE(
"Node has left the cluster '%s', avnd_cb->first_time_up %u,"
- "notifItem->clusterNode.nodeId %u, avnd_cb->node_info.nodeId %u",
+ "notifItem->clusterNode.nodeId %x, avnd_cb->node_info.nodeId %x",
osaf_extended_name_borrow(¬ifItem->clusterNode.nodeName),
avnd_cb->first_time_up, notifItem->clusterNode.nodeId,
avnd_cb->node_info.nodeId);
diff --git a/src/amf/amfnd/comp.cc b/src/amf/amfnd/comp.cc
index d805346bb..9e67cf388 100644
--- a/src/amf/amfnd/comp.cc
+++ b/src/amf/amfnd/comp.cc
@@ -2410,9 +2410,9 @@ uint32_t avnd_comp_proxied_del(AVND_CB *cb, AVND_COMP
*comp,
AVND_COMP_PXIED_REC *rec;
AVSV_PARAM_INFO param;
- TRACE_ENTER2("'%s': nodeid: %u comp_type: %u", comp->name.c_str(),
+ TRACE_ENTER2("'%s': nodeid: %x comp_type: %u", comp->name.c_str(),
comp->node_id, comp->comp_type);
- TRACE("pxy_comp:'%s': nodeid:%u comp_type: %u", pxy_comp->name.c_str(),
+ TRACE("pxy_comp:'%s': nodeid:%x comp_type: %u", pxy_comp->name.c_str(),
pxy_comp->node_id, pxy_comp->comp_type);
if (nullptr == rec_to_be_deleted) {
diff --git a/src/amf/amfnd/di.cc b/src/amf/amfnd/di.cc
index 20e752146..a2f573ad2 100644
--- a/src/amf/amfnd/di.cc
+++ b/src/amf/amfnd/di.cc
@@ -997,7 +997,7 @@ uint32_t avnd_di_susi_resp_send(AVND_CB *cb, AVND_SU *su,
AVND_SU_SI_REC *si) {
/* send the msg to AvD */
TRACE(
- "Sending. msg_id'%u', node_id'%u', msg_act'%u', su'%s', si'%s',
ha_state'%u', error'%u', single_csi'%u'",
+ "Sending. msg_id'%u', node_id'%x', msg_act'%u', su'%s', si'%s',
ha_state'%u', error'%u', single_csi'%u'",
msg.info.avd->msg_info.n2d_su_si_assign.msg_id,
msg.info.avd->msg_info.n2d_su_si_assign.node_id,
msg.info.avd->msg_info.n2d_su_si_assign.msg_act,
@@ -1794,7 +1794,7 @@ uint32_t avnd_evt_avd_role_change_evh(AVND_CB *cb,
AVND_EVT *evt) {
AVSV_D2N_ROLE_CHANGE_INFO *info =
&evt->info.avd->msg_info.d2n_role_change_info;
- TRACE("MsgId: %u,NodeId:%u, role rcvd:%u role present:%u", info->msg_id,
+ TRACE("MsgId: %u,NodeId:%x, role rcvd:%u role present:%u", info->msg_id,
info->node_id, info->role, cb->avail_state_avnd);
avnd_msgid_assert(info->msg_id);
diff --git a/src/amf/amfnd/imm.cc b/src/amf/amfnd/imm.cc
index 24db31af2..8dae727ff 100644
--- a/src/amf/amfnd/imm.cc
+++ b/src/amf/amfnd/imm.cc
@@ -276,7 +276,7 @@ void ImmReader::ir_process_event(AVND_EVT *evt) {
// Find the configured value of saClmNodeID from Clm node attributes.
(void)immutil_getAttr(const_cast<SaImmAttrNameT>("saClmNodeID"),
attributes, 0, &node_id);
- TRACE("Node id '%u'", node_id);
+ TRACE("Node id '%x'", node_id);
// We have all the information, send the event to the destined node.
res = avnd_avnd_msg_send(avnd_cb, reinterpret_cast<uint8_t *>(api_info),
diff --git a/src/amf/amfnd/proxy.cc b/src/amf/amfnd/proxy.cc
index ff33e108a..34fc98204 100644
--- a/src/amf/amfnd/proxy.cc
+++ b/src/amf/amfnd/proxy.cc
@@ -192,7 +192,7 @@ uint32_t avnd_evt_avd_comp_validation_resp_evh(AVND_CB *cb,
AVND_EVT *evt) {
info = &evt->info.avd->msg_info.d2n_comp_valid_resp_info;
info_comp_name = Amf::to_string(&info->comp_name);
- TRACE("%s:MsgId=%u,NodeId=%u,result:%u", info_comp_name.c_str(),
info->msg_id,
+ TRACE("%s:MsgId=%u,NodeId=%x,result:%u", info_comp_name.c_str(),
info->msg_id,
info->node_id, info->result);
for (auto temp_rec : cb->dnd_list) {
@@ -210,7 +210,7 @@ uint32_t avnd_evt_avd_comp_validation_resp_evh(AVND_CB *cb,
AVND_EVT *evt) {
osaf_extended_name_length(&info->comp_name)) != 0)) {
/* Seems the rec was deleted, some problem. */
LOG_ER(
- "Valid Rep:Rec is NULL or Name
Mismatch:%s:MsgId:%u,NodeId:%u,result:%u",
+ "Valid Rep:Rec is NULL or Name
Mismatch:%s:MsgId:%u,NodeId:%x,result:%u",
info_comp_name.c_str(), info->msg_id, info->node_id, info->result);
rc = NCSCC_RC_FAILURE;
goto done;
@@ -270,7 +270,7 @@ uint32_t avnd_evt_avd_comp_validation_resp_evh(AVND_CB *cb,
AVND_EVT *evt) {
&comp->mds_ctxt, comp->node_id);
if (rc != NCSCC_RC_SUCCESS) {
- LOG_ER("avnd_avnd_msg_send failed:%s:MsgId:%u,NodeId:%u,result:%u",
+ LOG_ER("avnd_avnd_msg_send failed:%s:MsgId:%u,NodeId:%x,result:%u",
info_comp_name.c_str(), info->msg_id, info->node_id, rc);
amf_rc = SA_AIS_ERR_TRY_AGAIN;
@@ -318,7 +318,7 @@ done:
if (NCSCC_RC_SUCCESS != rc) {
LOG_ER(
- "avnd_evt_avd_comp_validation_resp_msg
failed:%s:MsgId:%u,NodeId:%u,result:%u",
+ "avnd_evt_avd_comp_validation_resp_msg
failed:%s:MsgId:%u,NodeId:%x,result:%u",
info_comp_name.c_str(), info->msg_id, info->node_id, info->result);
}
TRACE_LEAVE();
@@ -349,7 +349,7 @@ uint32_t avnd_avnd_msg_send(AVND_CB *cb, uint8_t *msg_info,
MDS_DEST i_to_dest = 0;
AVSV_AMF_API_INFO *info = (AVSV_AMF_API_INFO *)msg_info;
- TRACE_ENTER2("Type%u,NodeID=%u", type, node_id);
+ TRACE_ENTER2("Type%u,NodeID=%x", type, node_id);
/* Create a Registration message and send to AvND */
memset(&msg, 0, sizeof(AVND_MSG));
@@ -408,7 +408,7 @@ uint32_t avnd_avnd_msg_send(AVND_CB *cb, uint8_t *msg_info,
done:
if (NCSCC_RC_SUCCESS != rc) {
- LOG_ER("%s,AvND Send Failure:Type:%u,NodeID:%u, Mds:%" PRId64 ", rc:%u",
+ LOG_ER("%s,AvND Send Failure:Type:%u,NodeID:%x, Mds:%" PRId64 ", rc:%u",
__FUNCTION__, type, node_id, i_to_dest, rc);
}
@@ -657,7 +657,7 @@ uint32_t avnd_avnd_cbk_del_send(AVND_CB *cb, const
std::string &comp_name,
AVND_MSG msg;
SaNameT name;
- TRACE_ENTER2("%s,NodeID=%u,opq_hdl=%u", comp_name.c_str(), *node_id,
+ TRACE_ENTER2("%s,NodeID=%x,opq_hdl=%u", comp_name.c_str(), *node_id,
*opq_hdl);
osaf_extended_name_alloc(comp_name.c_str(), &name);
@@ -677,7 +677,7 @@ uint32_t avnd_avnd_cbk_del_send(AVND_CB *cb, const
std::string &comp_name,
uint32_t rc = avnd_avnd_mds_send(cb, i_to_dest, &msg);
if (NCSCC_RC_SUCCESS != rc) {
- LOG_ER("AvND Send Failure:%s:NodeID:%u,opq_hdl:%u,MdsDest:%" PRId64,
+ LOG_ER("AvND Send Failure:%s:NodeID:%x,opq_hdl:%u,MdsDest:%" PRId64,
comp_name.c_str(), *node_id, *opq_hdl, i_to_dest);
}
diff --git a/src/amf/amfnd/proxydb.cc b/src/amf/amfnd/proxydb.cc
index 4cb0acd93..aff50ec9c 100644
--- a/src/amf/amfnd/proxydb.cc
+++ b/src/amf/amfnd/proxydb.cc
@@ -51,7 +51,7 @@ uint32_t avnd_nodeid_mdsdest_rec_add(AVND_CB *cb, MDS_DEST
mds_dest) {
(AVND_NODEID_TO_MDSDEST_MAP *)cb->nodeid_mdsdest_db.find(node_id);
if (rec != nullptr) {
LOG_ER("nodeid_mdsdest rec already exists, Rec Add Failed: MdsDest:%"
PRId64
- ", NodeId:%u",
+ ", NodeId:%x",
mds_dest, node_id);
return NCSCC_RC_FAILURE;
} else {
@@ -65,7 +65,7 @@ uint32_t avnd_nodeid_mdsdest_rec_add(AVND_CB *cb, MDS_DEST
mds_dest) {
if (NCSCC_RC_SUCCESS != res) {
LOG_ER(
"Couldn't add nodeid_mdsdest rec, patricia add failed:MdsDest:%"
PRId64
- ", NodeId:%u",
+ ", NodeId:%x",
mds_dest, node_id);
delete rec;
return res;
@@ -97,7 +97,7 @@ uint32_t avnd_nodeid_mdsdest_rec_del(AVND_CB *cb, MDS_DEST
mds_dest) {
if (rec == nullptr) {
LOG_ER("nodeid_mdsdest rec doesn't exist, Rec del failed: MdsDest:%" PRId64
- " NodeId:%u",
+ " NodeId:%x",
mds_dest, node_id);
return NCSCC_RC_FAILURE;
} else {
@@ -125,7 +125,7 @@ MDS_DEST avnd_get_mds_dest_from_nodeid(AVND_CB *cb, NODE_ID
node_id) {
AVND_NODEID_TO_MDSDEST_MAP *rec =
(AVND_NODEID_TO_MDSDEST_MAP *)cb->nodeid_mdsdest_db.find(node_id);
if (rec == nullptr) {
- LOG_ER("nodeid_mdsdest rec doesn't exist, Rec get failed: NodeId:%u",
+ LOG_ER("nodeid_mdsdest rec doesn't exist, Rec get failed: NodeId:%x",
node_id);
return 0;
}
@@ -165,7 +165,7 @@ AVND_COMP *avnd_internode_comp_add(AVND_CB *cb, const
std::string &name,
/* This is a proxy and already proxying at least one component.
So, no problem. */
*rc = SA_AIS_ERR_EXIST;
- TRACE_1("avnd_internode_comp_add already exists. %s and NodeId:%u",
+ TRACE_1("avnd_internode_comp_add already exists. %s and NodeId:%x",
name.c_str(), node_id);
return comp;
}
@@ -209,7 +209,7 @@ AVND_COMP *avnd_internode_comp_add(AVND_CB *cb, const
std::string &name,
}
TRACE_1(
- "avnd_internode_comp_add:%s nodeid:%u,
pxy_for_ext_comp:%u,comp_is_proxy:%u",
+ "avnd_internode_comp_add:%s nodeid:%x,
pxy_for_ext_comp:%u,comp_is_proxy:%u",
comp->name.c_str(), node_id, pxy_for_ext_comp, comp_is_proxy);
return comp;
@@ -219,7 +219,7 @@ err:
avnd_comp_delete(comp);
}
- LOG_ER("avnd_internode_comp_add failed.%s: NodeId:%u", name.c_str(),
node_id);
+ LOG_ER("avnd_internode_comp_add failed.%s: NodeId:%x", name.c_str(),
node_id);
return 0;
}
@@ -249,7 +249,7 @@ uint32_t avnd_internode_comp_del(AVND_CB *cb, const
std::string &name) {
LOG_ER("internode_comp_del failed. Rec doesn't exist :%s", name.c_str());
goto err;
}
- TRACE("avnd_internode_comp_del:%s: nodeid:%u, comp_type:%u",
+ TRACE("avnd_internode_comp_del:%s: nodeid:%x, comp_type:%u",
comp->name.c_str(), comp->node_id, comp->comp_type);
/* Delete the callbacks if any. */
--
2.25.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
