[devel] [PATCH 1/2] mds: Log the message loss by default [#3304]

[hieu.h.hoang]

The message loss will be logged to mds log even if the loss indication is 
disabled.
---
 src/mds/mds_c_sndrcv.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mds/mds_c_sndrcv.c b/src/mds/mds_c_sndrcv.c
index 557f68a4b..c3002a5fd 100644
--- a/src/mds/mds_c_sndrcv.c
+++ b/src/mds/mds_c_sndrcv.c
@@ -4683,9 +4683,8 @@ uint32_t mds_mcm_ll_data_rcv(MDS_DATA_RECV *recv)
        }
 
        /* For the message loss indication */
-       if ((true == svccb->i_msg_loss_indication) &&
-           ((recv->snd_type != MDS_SENDTYPE_ACK) ||
-            (recv->snd_type != MDS_SENDTYPE_RACK))) {
+       if (recv->snd_type != MDS_SENDTYPE_ACK
+                       && recv->snd_type != MDS_SENDTYPE_RACK) {
                /* Get the subscription table result table function pointer */
                MDS_SUBSCRIPTION_RESULTS_INFO *lcl_subtn_res = NULL;
                if (NCSCC_RC_SUCCESS == mds_get_subtn_res_tbl_by_adest(
@@ -4694,19 +4693,20 @@ uint32_t mds_mcm_ll_data_rcv(MDS_DATA_RECV *recv)
                                            recv->src_adest, &lcl_subtn_res)) {
                        if (recv->src_seq_num != lcl_subtn_res->msg_rcv_cnt) {
                                m_MDS_LOG_ERR(
-                                   "MDS_SND_RCV: msg loss detected, Src svc_id 
= %s(%d), Src vdest id= %d,\
-                                               Src Adest = %" PRIu64
-                                   ", local svc_id = %s(%d) msg num=%d, recvd 
cnt=%d\n",
+                                   "MDS_SND_RCV: msg loss detected, Src svc_id 
= %s(%d),"
+                                   " Src vdest id= %d, Src Adest = %" PRIu64 
","
+                                   " local svc_id = %s(%d) msg num=%d, recvd 
cnt=%d\n",
                                    get_svc_names(recv->src_svc_id),
                                    recv->src_svc_id, recv->src_vdest,
                                    recv->src_adest,
                                    get_svc_names(svccb->svc_id), svccb->svc_id,
                                    recv->src_seq_num,
                                    lcl_subtn_res->msg_rcv_cnt);
-
-                               mds_mcm_msg_loss(
-                                   recv->dest_svc_hdl, recv->src_adest,
-                                   recv->src_svc_id, recv->src_vdest);
+                               if (svccb->i_msg_loss_indication == true) {
+                                       mds_mcm_msg_loss(
+                                               recv->dest_svc_hdl, 
recv->src_adest,
+                                               recv->src_svc_id, 
recv->src_vdest);
+                               }
                                lcl_subtn_res->msg_rcv_cnt = recv->src_seq_num;
                                lcl_subtn_res->msg_rcv_cnt++;
                        } else {
-- 
2.25.1



_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel