[devel] [PATCH 1/2] mds: fix explicit replay callback metadata [#3397]

[Thien H. <thi...@en...>]

---
 src/mds/mds_c_api.c |  3 ++-
 src/mds/mds_c_db.c  | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/mds/mds_c_api.c b/src/mds/mds_c_api.c
index 4faa69d09..29af170be 100644
--- a/src/mds/mds_c_api.c
+++ b/src/mds/mds_c_api.c
@@ -2087,7 +2087,8 @@ uint32_t mds_mcm_await_active_tmr_expiry(MDS_SVC_HDL svc_hdl,
        status = mds_mcm_user_event_callback(
            svc_hdl, m_MDS_GET_PWE_ID_FROM_SVC_HDL(svc_hdl), sub_svc_id,
            V_DEST_RL_STANDBY, vdest_id, 0, NCSMDS_DOWN,
-           active_subtn_result_info->rem_svc_sub_part_ver,
+           active_subtn_result_info->info.active_vdest.active_route_info
+               ->last_active_svc_sub_part_ver,
            MDS_SVC_ARCHWORD_TYPE_UNSPECIFIED);
        if (status != NCSCC_RC_SUCCESS) {
                /* Callback failure */
diff --git a/src/mds/mds_c_db.c b/src/mds/mds_c_db.c
index 2213c664b..193378876 100644
--- a/src/mds/mds_c_db.c
+++ b/src/mds/mds_c_db.c
@@ -1480,7 +1480,9 @@ uint32_t mds_subtn_tbl_change_explicit(MDS_SVC_HDL svc_hdl,
                                                            ->key.vdest_id,
                                                        0, NCSMDS_NO_ACTIVE,
                                                        temp_subtn_result_info
-                                                           ->rem_svc_sub_part_ver,
+                                                           ->info.active_vdest
+                                                           .active_route_info
+                                                           ->last_active_svc_sub_part_ver,
                                                        MDS_SVC_ARCHWORD_TYPE_UNSPECIFIED)) {
                                                        m_MDS_LOG_ERR(
                                                            "MDS:DB:mds_mcm_user_event_callback: Await Active Entry: F, svc_id=%d, subscribed_svc=%d",
@@ -1489,6 +1491,12 @@ uint32_t mds_subtn_tbl_change_explicit(MDS_SVC_HDL svc_hdl,
                                                            subscr_svc_id);
                                                }
                                        } else { /* Active entry exist */
+                                               MDS_SUBSCRIPTION_RESULTS_INFO
+                                               *next_active_in_turn =
+                                                   temp_subtn_result_info
+                                                       ->info.active_vdest
+                                                       .active_route_info
+                                                       ->next_active_in_turn;

                                                /* Call user callback UP for
                                                 * first active */
@@ -1501,15 +1509,12 @@ uint32_t mds_subtn_tbl_change_explicit(MDS_SVC_HDL svc_hdl,
                                                        V_DEST_RL_ACTIVE,
                                                        temp_subtn_result_info
                                                            ->key.vdest_id,
-                                                       temp_subtn_result_info
-                                                           ->info.active_vdest
-                                                           .active_route_info
-                                                           ->next_active_in_turn
+                                                       next_active_in_turn
                                                            ->key.adest,
                                                        NCSMDS_UP,
-                                                       temp_subtn_result_info
+                                                       next_active_in_turn
                                                            ->rem_svc_sub_part_ver,
-                                                       temp_subtn_result_info
+                                                       next_active_in_turn
                                                            ->rem_svc_arch_word)) {
                                                        m_MDS_LOG_ERR(
                                                            "MDS:DB:mds_mcm_user_event_callback: Active Entry: F, svc_id=%d, subscribed_svc=%d",
--
2.34.1


The information in this email is confidential and may be legally privileged. It is intended solely for the addressee. Any opinions expressed are mine and do not necessarily represent the opinions of the Company. Emails are susceptible to interference. If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it, is strictly prohibited and may be unlawful. If you have received this message in error, do not open any attachments but please notify the Endava Service Desk on (+44 (0)870 423 0187), and delete this message from your system. The sender accepts no responsibility for information, errors or omissions in this email, or for its use or misuse, or for any act committed or omitted in connection with this communication. If in doubt, please verify the authenticity of the contents with the sender. Please rely on your own virus checkers as no responsibility is taken by the sender for any damage rising out of any bug or virus infection.

Endava plc is a company registered in England under company number 5722669 whose registered office is at 125 Old Broad Street, London, EC2N 1AR, United Kingdom. Endava plc is the Endava group holding company and does not provide any services to clients. Each of Endava plc and its subsidiaries is a separate legal entity and has no liability for another such entity's acts or omissions.