ack, code review. One minor comment, prefix %x with 0x%x. /Thanks HansN
On 11/01/2016 11:56 AM, nagendr...@oracle.com wrote:
> osaf/services/saf/amf/amfd/clm.cc | 3 ++-
> osaf/services/saf/amf/amfd/ndfsm.cc | 4 +++-
> osaf/services/saf/amf/amfd/ndproc.cc | 6 +++---
> osaf/services/saf/amf/amfd/pg.cc | 2 +-
> osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 2 +-
> osaf/services/saf/amf/amfd/sgproc.cc | 7 ++++---
> osaf/services/saf/amf/amfd/su.cc | 6 ++++--
> osaf/services/saf/amf/amfnd/di.cc | 2 +-
> 8 files changed, 19 insertions(+), 13 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/clm.cc
> b/osaf/services/saf/amf/amfd/clm.cc
> --- a/osaf/services/saf/amf/amfd/clm.cc
> +++ b/osaf/services/saf/amf/amfd/clm.cc
> @@ -60,7 +60,8 @@ static void clm_node_join_complete(AVD_A
>
> su->set_term_state(false);
>
> su->sg_of_su->try_inst_counter++;
> } else {
> - LOG_ER("Internal error,
> could not send message to avnd");
> + LOG_ER("Internal error,
> could not send SU'%s' pres message to avnd '%x'",
> +
> su->name.c_str(), su->su_on_node->node_info.nodeId);
> }
> }
> }
> diff --git a/osaf/services/saf/amf/amfd/ndfsm.cc
> b/osaf/services/saf/amf/amfd/ndfsm.cc
> --- a/osaf/services/saf/amf/amfd/ndfsm.cc
> +++ b/osaf/services/saf/amf/amfd/ndfsm.cc
> @@ -306,7 +306,9 @@ void avd_node_up_evh(AVD_CL_CB *cb, AVD_
> cb->node_sync_window_closed == false) {
> avnd =
> avd_node_get(Amf::to_string(&n2d_msg->msg_info.n2d_node_up.node_name));
> if (avnd == nullptr) {
> - LOG_ER("Invalid node_name. Check node_id");
> + LOG_ER("Invalid node_name '%s'. Check node_id '%x'",
> +
> osaf_extended_name_borrow(&n2d_msg->msg_info.n2d_node_up.node_name),
> + n2d_msg->msg_info.n2d_node_up.node_id);
>
> // perhaps this is a node_up from an old version of
> amfnd without headless support
> // let's check if the node_id is valid
> diff --git a/osaf/services/saf/amf/amfd/ndproc.cc
> b/osaf/services/saf/amf/amfd/ndproc.cc
> --- a/osaf/services/saf/amf/amfd/ndproc.cc
> +++ b/osaf/services/saf/amf/amfd/ndproc.cc
> @@ -111,7 +111,7 @@ void avd_reg_su_evh(AVD_CL_CB *cb, AVD_E
> }
>
> if ((node->node_state == AVD_AVND_STATE_ABSENT) || (node->node_state ==
> AVD_AVND_STATE_GO_DOWN)) {
> - LOG_ER("%s: invalid node state %u", __FUNCTION__,
> node->node_state);
> + LOG_ER("%s: invalid node state %u for node id '%u'",
> __FUNCTION__, node->node_state, n2d_msg->msg_info.n2d_reg_su.node_id);
> avsv_dnd_msg_free(n2d_msg);
> evt->info.avnd_msg = nullptr;
> goto done;
> @@ -244,7 +244,7 @@ void avd_oper_req_evh(AVD_CL_CB *cb, AVD
> }
>
> if ((node->node_state == AVD_AVND_STATE_ABSENT) || (node->node_state ==
> AVD_AVND_STATE_GO_DOWN)) {
> - LOG_ER("%s: invalid node state %u", __FUNCTION__,
> node->node_state);
> + LOG_ER("%s: invalid node state %u for node id '%u'",
> __FUNCTION__, node->node_state, n2d_msg->msg_info.n2d_op_req.node_id);
> goto done;
> }
>
> @@ -1098,7 +1098,7 @@ void avd_comp_validation_evh(AVD_CL_CB *
> }
>
> if ((node->node_state == AVD_AVND_STATE_ABSENT) || (node->node_state ==
> AVD_AVND_STATE_GO_DOWN)) {
> - LOG_ER("%s: invalid node state %u", __FUNCTION__,
> node->node_state);
> + LOG_ER("%s: invalid node state %u for node id '%u'",
> __FUNCTION__, node->node_state, valid_info->node_id);
> avsv_dnd_msg_free(n2d_msg);
> evt->info.avnd_msg = nullptr;
> goto done;
> diff --git a/osaf/services/saf/amf/amfd/pg.cc
> b/osaf/services/saf/amf/amfd/pg.cc
> --- a/osaf/services/saf/amf/amfd/pg.cc
> +++ b/osaf/services/saf/amf/amfd/pg.cc
> @@ -77,7 +77,7 @@ void avd_pg_trk_act_evh(AVD_CL_CB *cb, A
> m_AVD_SET_AVND_RCV_ID(cb, node, (n2d_msg->msg_info.n2d_reg_su.msg_id));
>
> if ((node->node_state == AVD_AVND_STATE_ABSENT) || (node->node_state ==
> AVD_AVND_STATE_GO_DOWN)) {
> - LOG_ER("%s: invalid node state %u", __FUNCTION__,
> node->node_state);
> + LOG_ER("%s: invalid node state %u for node id '%u'",
> __FUNCTION__, node->node_state, info->node_id);
> goto done;
> }
>
> diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> @@ -1398,7 +1398,7 @@ uint32_t SG_2N::su_insvc(AVD_CL_CB *cb,
> /* An SU will not become in service when the SG is being locked or
> shutdown.
> */
> if (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_SG_ADMIN) {
> - LOG_ER("Wrong sg fsm state %u", su->sg_of_su->sg_fsm_state);
> + LOG_ER("Wrong sg fsm state %u for sg '%s'",
> su->sg_of_su->sg_fsm_state, su->sg_of_su->name.c_str());
> rc = NCSCC_RC_FAILURE;
> goto done;
> }
> diff --git a/osaf/services/saf/amf/amfd/sgproc.cc
> b/osaf/services/saf/amf/amfd/sgproc.cc
> --- a/osaf/services/saf/amf/amfd/sgproc.cc
> +++ b/osaf/services/saf/amf/amfd/sgproc.cc
> @@ -659,7 +659,7 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb
> }
>
> if ((node->node_state == AVD_AVND_STATE_ABSENT) ||(node->node_state ==
> AVD_AVND_STATE_GO_DOWN)) {
> - LOG_ER("%s: invalid node state %u", __FUNCTION__,
> node->node_state);
> + LOG_ER("%s: invalid node state %u for node id '%u'",
> __FUNCTION__, node->node_state, n2d_msg->msg_info.n2d_opr_state.node_id);
> goto done;
> }
>
> @@ -1048,7 +1048,7 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb,
> }
>
> if ((node->node_state == AVD_AVND_STATE_ABSENT) || (node->node_state ==
> AVD_AVND_STATE_GO_DOWN)) {
> - LOG_ER("%s: invalid node state %u", __FUNCTION__,
> node->node_state);
> + LOG_ER("%s: invalid node state %u for node id '%u'",
> __FUNCTION__, node->node_state, n2d_msg->msg_info.n2d_su_si_assign.node_id);
> goto done;
> }
>
> @@ -1098,7 +1098,8 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb,
> }
>
> if (su->list_of_susi == AVD_SU_SI_REL_NULL) {
> - LOG_WA("%s: no susis", __FUNCTION__);
> + LOG_WA("%s: SU'%s' has no susis", __FUNCTION__,
> +
> osaf_extended_name_borrow(&n2d_msg->msg_info.n2d_su_si_assign.su_name));
> goto done;
> }
>
> diff --git a/osaf/services/saf/amf/amfd/su.cc
> b/osaf/services/saf/amf/amfd/su.cc
> --- a/osaf/services/saf/amf/amfd/su.cc
> +++ b/osaf/services/saf/amf/amfd/su.cc
> @@ -1046,7 +1046,8 @@ void AVD_SU::lock_instantiation(SaImmOiH
> goto done;
> }
> report_admin_op_error(immoi_handle, invocation,
> SA_AIS_ERR_TRY_AGAIN, nullptr,
> - "Internal error, could not send message to
> avnd");
> + "Internal error, could not send SU'%s' pres
> message to avnd '%x'",
> + name.c_str(), node->node_info.nodeId);
> goto done;
> } else {
> set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION);
> @@ -1107,7 +1108,8 @@ void AVD_SU::unlock_instantiation(SaImmO
> goto done;
> }
> report_admin_op_error(immoi_handle, invocation,
> SA_AIS_ERR_TRY_AGAIN, nullptr,
> - "Internal error, could not send message to
> avnd");
> + "Internal error, could not send SU'%s' pres
> message to avnd '%x'",
> + name.c_str(), node->node_info.nodeId);
> } else {
> set_admin_state(SA_AMF_ADMIN_LOCKED);
> avd_saImmOiAdminOperationResult(immoi_handle, invocation,
> SA_AIS_OK);
> diff --git a/osaf/services/saf/amf/amfnd/di.cc
> b/osaf/services/saf/amf/amfnd/di.cc
> --- a/osaf/services/saf/amf/amfnd/di.cc
> +++ b/osaf/services/saf/amf/amfnd/di.cc
> @@ -261,7 +261,7 @@ uint32_t avnd_evt_avd_operation_request_
> if (NCSCC_RC_SUCCESS == rc)
> msg.info.avd = 0; // TODO Mem leak?
> else
> - LOG_ER("avnd_di_msg_send FAILED");
> + LOG_ER("avnd_di_msg_send FAILED for msg type '%u'",
> msg.info.avd->msg_type);
>
> avnd_msg_content_free(cb, &msg);
> }
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
