Ack, code review only/Thanks HansN
-----Original Message-----
From: Gary Lee [mailto:[email protected]]
Sent: den 25 april 2016 07:56
To: Hans Nordebäck
Cc: [email protected]
Subject: [PATCH 1 of 1] amfnd: reset rcv_msg_id on AVD down [#1728]
osaf/services/saf/amf/amfnd/di.cc | 1 - osaf/services/saf/amf/amfnd/mds.cc
| 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
This patch reverts the change in behaviour introduced in changeset
3451e8a8ba90, where rcv_msg_id reset was moved from avnd_evt_mds_avd_dn_evh()
to avnd_evt_mds_avd_up_evh().
rcv_msg_id is now reset in avnd_mds_svc_evt() when MDS_DOWN is received for
amfd, to avoid possible thread related race conditions.
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
@@ -525,7 +525,6 @@ uint32_t avnd_evt_mds_avd_up_evh(AVND_CB
*/
if (evt->info.mds.i_change == NCSMDS_UP) {
if (cb->amfd_sync_required && cb->led_state ==
AVND_LED_STATE_GREEN) {
- cb->rcv_msg_id = 0;
avnd_sync_sisu(cb);
avnd_sync_csicomp(cb);
}
diff --git a/osaf/services/saf/amf/amfnd/mds.cc
b/osaf/services/saf/amf/amfnd/mds.cc
--- a/osaf/services/saf/amf/amfnd/mds.cc
+++ b/osaf/services/saf/amf/amfnd/mds.cc
@@ -682,9 +682,10 @@ uint32_t avnd_mds_svc_evt(AVND_CB *cb, M
case NCSMDS_SVC_ID_AVD:
if (m_MDS_DEST_IS_AN_ADEST(evt_info->i_dest) &&
(evt_info->i_node_id != ncs_get_node_id())) {
/* No action is required, Proceed ahead. */
- } else /* Reset the vdest as this node is going to get
rebooted. */
+ } else /* Reset the vdest as this node is going to get
rebooted. */ {
+ cb->rcv_msg_id = 0;
memset(&cb->avd_dest, 0, sizeof(MDS_DEST));
-
+ }
evt = avnd_evt_create(cb, AVND_EVT_MDS_AVD_DN, 0,
&evt_info->i_dest, &evt_info->i_node_id,
0, 0);
break;
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
