[devel] [PATCH 1/3] mds: fix replacement active callback payload [#3396]

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

---
 src/mds/mds_svc_op.c | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/mds/mds_svc_op.c b/src/mds/mds_svc_op.c
index 5ad51eea4..f5b07e052 100644
--- a/src/mds/mds_svc_op.c
+++ b/src/mds/mds_svc_op.c
@@ -1112,14 +1112,21 @@ uint32_t mds_svc_op_vdest_mxn_standby_update(const MCM_SVC_INFO *info) {
                }

                status = mds_subtn_res_tbl_query_next_active(
-                               info->local_svc_hdl, info->svc_id, info->vdest,
-                               subtn_result_info, &next_active_result_info);
+                   info->local_svc_hdl, info->svc_id, info->vdest,
+                   subtn_result_info, &next_active_result_info);
                if (status == NCSCC_RC_SUCCESS) {
+                       MCM_SVC_INFO act_info = *info;
+                       act_info.adest = next_active_result_info->key.adest;
+                       act_info.role = V_DEST_RL_ACTIVE;
+                       act_info.sub_part_ver =
+                           next_active_result_info->rem_svc_sub_part_ver;
+                       act_info.arch_word =
+                           next_active_result_info->rem_svc_arch_word;
                        /* Other active present. Change active entry */
-                       mds_svc_op_subtn_res_tbl_change_active(info,
-                               next_active_result_info);
-                       status = mds_svc_op_user_callback(UP_TAG,
-                               NCSMDS_NEW_ACTIVE, info);
+                       mds_svc_op_subtn_res_tbl_change_active(
+                           &act_info, next_active_result_info);
+                       status = mds_svc_op_user_callback(
+                           UP_TAG, NCSMDS_NEW_ACTIVE, &act_info);
                        if (status != NCSCC_RC_SUCCESS) {
                                return NCSCC_RC_FAILURE;
                        }
@@ -1212,21 +1219,23 @@ uint32_t mds_svc_op_vdest_mxn_active_delete(const MCM_SVC_INFO *info) {
                                return NCSCC_RC_FAILURE;
                        }
                } else {
-                       status = mds_svc_op_user_callback(DOWN_TAG,
-                                                         NCSMDS_NO_ACTIVE,
-                                                         &callback_info);
+                       status = mds_svc_op_user_callback(
+                           DOWN_TAG, NCSMDS_NO_ACTIVE, &callback_info);
                        if (status != NCSCC_RC_SUCCESS) {
                                return NCSCC_RC_FAILURE;
                        }
-                       /* Change Active entry */
-                       mds_svc_op_subtn_res_tbl_change_active(info,
-                               next_active_result_info);
-
                        MCM_SVC_INFO act_info = *info;
                        act_info.adest = next_active_result_info->key.adest;
-                       status = mds_svc_op_user_callback(DOWN_TAG,
-                                                         NCSMDS_NEW_ACTIVE,
-                                                         &act_info);
+                       act_info.role = V_DEST_RL_ACTIVE;
+                       act_info.sub_part_ver =
+                           next_active_result_info->rem_svc_sub_part_ver;
+                       act_info.arch_word =
+                           next_active_result_info->rem_svc_arch_word;
+                       /* Change Active entry */
+                       mds_svc_op_subtn_res_tbl_change_active(
+                           &act_info, next_active_result_info);
+                       status = mds_svc_op_user_callback(
+                           DOWN_TAG, NCSMDS_NEW_ACTIVE, &act_info);
                        if (status != NCSCC_RC_SUCCESS) {
                                return NCSCC_RC_FAILURE;
                        }
--
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.