Hi Nagu Yes, that particular test case now passes.
I had a quick look at the code, it seems OK - I see you’ve moved the reset logic to the MDS thread. /Gary On 20/04/2016, 5:47 PM, "Nagendra Kumar" <nagendr...@oracle.com> wrote: >Hi Gary, > Thanks for your help. >I am not able to get much information from amfnd traces as I need the event >type, which make it crash. > >>> In avnd_mds_rcv(), when it receives AVSV_D2N_DATA_VERIFY_MSG, it sends an >>> event to the main thread with avnd_evt_create(). But a few lines later, >the MDS thread calls update_rcv_msg_id(). So if update_rcv_msg_id() is >processed before the event is processed in the main thread, then the mismatch >will occur. > >The update happens before sending the event in the mail box and hence, the >update will happen first and assert should be called from here only in >update_* function. So, I am not getting your point. > >Anyway, I have added some traces along with the fix. Can you please apply this >patch on top and run the tests and if crash happens, please share: >1. amfnd traces >2. Amfd traces from Old Act and New Act. >3. syslog of controllers and payload. > >Thanks >-Nagu > >> -----Original Message----- >> From: Gary Lee [mailto:gary....@dektech.com.au] >> Sent: 20 April 2016 06:16 >> To: Nagendra Kumar; Hans Nordebäck; Praveen Malviya; Minh Hon Chau >> Cc: opensaf-devel@lists.sourceforge.net >> Subject: Re: [devel] [PATCH 1 of 1] amfnd: remove receive message id >> counter from threads [#1728] >> >> Hi Nagu >> >> I’ve attached the amfnd trace for SC-1. >> >> The test involves rebooting the active SC. It fails within the first 2 or 3 >> iterations. >> >> 2016-04-20 10:19:20 SC-1 osafamfd[468]: NO FAILOVER StandBy --> Active >> 2016-04-20 10:19:20 SC-1 osafimmnd[431]: NO This IMMND is now the NEW >> Coord >> 2016-04-20 10:19:20 SC-1 osafimmnd[431]: NO SETTING COORD TO 1 >> CLOUD PROTO >> 2016-04-20 10:19:20 SC-1 osafimmnd[431]: NO STARTING PBE process. >> 2016-04-20 10:19:20 SC-1 osafimmnd[431]: NO pbe-db-file- >> path:/srv/shared/imm//imm.db VETERAN:1 B:0 >> 2016-04-20 10:19:20 SC-1 osafamfnd[477]: NO AVD NEW_ACTIVE, adest:1 >> 2016-04-20 10:19:20 SC-1 osafimmnd[431]: NO Implementer connected: 22 >> (safClmService) <97, 2010f> >> 2016-04-20 10:19:20 SC-1 osafimmnd[431]: NO Implementer disconnected >> 20 <105, 2010f> (@safAmfService2010f) >> 2016-04-20 10:19:20 SC-1 osafamfnd[477]: Rebooting OpenSAF NodeId = 0 >> EE Name = No EE Mapped, Reason: Message ID mismatch, rec 1, expected 7, >> OwnNodeId = 131343, SupervisionTime = 60 >> >> In avnd_mds_rcv(), when it receives AVSV_D2N_DATA_VERIFY_MSG, it sends >> an event to the main thread with avnd_evt_create(). But a few lines later, >> the MDS thread calls update_rcv_msg_id(). So if update_rcv_msg_id() is >> processed before the event is processed in the main thread, then the >> mismatch will occur. >> >> >> >> Thanks >> gary >> >> On 20/04/2016, 12:56 AM, "Nagendra Kumar" <nagendr...@oracle.com> >> wrote: >> >> >Hi Gary, >> > Can you please send me the scenarios (may be core dump or >> flows) in which it is crashing, preferably, old Act and new Act amfd and >> amfnd traces. Is it crashing in SU instantiation during failover or >> switchover? >> > >> >Thanks >> >-Nagu >> >> -----Original Message----- >> >> From: Nagendra Kumar >> >> Sent: 19 April 2016 14:41 >> >> To: Hans Nordebäck; Gary Lee; Praveen Malviya; Minh Hon Chau >> >> Cc: opensaf-devel@lists.sourceforge.net >> >> Subject: Re: [devel] [PATCH 1 of 1] amfnd: remove receive message id >> >> counter from threads [#1728] >> >> >> >> Hi Hans N, >> >> Yes, we need this patch. I am working on the solution and it >> >> would be simple. >> >> >> >> Thanks >> >> -Nagu >> >> >> >> > -----Original Message----- >> >> > From: Hans Nordebäck [mailto:hans.nordeb...@ericsson.com] >> >> > Sent: 19 April 2016 13:54 >> >> > To: Nagendra Kumar; Gary Lee; Praveen Malviya; Minh Hon Chau >> >> > Cc: opensaf-devel@lists.sourceforge.net >> >> > Subject: RE: [PATCH 1 of 1] amfnd: remove receive message id counter >> >> > from threads [#1728] >> >> > >> >> > Hi Nagu, >> >> > >> >> > I think it would be good to revert this patch and aim for a complete >> >> > solution in the next release instead. It is a risk to introduce this >> >> > new thread this late in the release. Are there anyone requesting this >> >> > patch? /Thanks HansN >> >> > >> >> > -----Original Message----- >> >> > From: Nagendra Kumar [mailto:nagendr...@oracle.com] >> >> > Sent: den 19 april 2016 10:17 >> >> > To: Gary Lee; Hans Nordebäck; Praveen Malviya; Minh Hon Chau >> >> > Cc: opensaf-devel@lists.sourceforge.net >> >> > Subject: RE: [PATCH 1 of 1] amfnd: remove receive message id counter >> >> > from threads [#1728] >> >> > >> >> > Hi Gary, >> >> > I am looking into it. It is rare chance that Amfnd >> >> > didn’t >> >> process >> >> > Old Amfd messages and it has got new Amfd message(Data verify) after >> >> > failover/switchover. >> >> > >> >> > Thanks >> >> > -Nagu >> >> > > -----Original Message----- >> >> > > From: Gary Lee [mailto:gary....@dektech.com.au] >> >> > > Sent: 19 April 2016 13:11 >> >> > > To: Nagendra Kumar; Hans Nordebäck; Praveen Malviya; >> >> > > minh.c...@dektech.com.au >> >> > > Cc: opensaf-devel@lists.sourceforge.net >> >> > > Subject: Re: [PATCH 1 of 1] amfnd: remove receive message id >> counter >> >> > > from threads [#1728] >> >> > > >> >> > > Just to add some information. >> >> > > >> >> > > We’re seeing SC failover randomly failing with: >> >> > > >> >> > > 2016-04-18 20:06:02 SC-2 osafamfnd[479]: Rebooting OpenSAF >> NodeId = >> >> > > 0 EE Name = No EE Mapped, Reason: Message ID mismatch, rec 1, >> >> > > expected 7, OwnNodeId = 131599, SupervisionTime = 60 >> >> > > >> >> > > >> >> > > Apr 18 20:06:02.657256 osafamfnd [479:verify.cc:0094] >> >> >> > > avnd_evt_avd_verify_evh: Data Verify message received from newly >> >> > > ACTIVE AVD Apr 18 20:06:02.657259 osafamfnd [479:verify.cc:0107] >> T1 >> >> > > AVD send ID >> >> > > count: 6 >> >> > > Apr 18 20:06:02.657263 osafamfnd [479:verify.cc:0108] T1 AVND >> >> > > receive ID >> >> > > count: 6 >> >> > > Apr 18 20:06:02.657266 osafamfnd [479:di.cc:1055] >> >> >> > > avnd_di_ack_nack_msg_send: Receive id = 6 Apr 18 20:06:02.657271 >> >> > > osafamfnd [479:di.cc:1071] T1 MsgId=63,ACK=1 >> >> > > >> >> > > Look at the code, it seems the MDS thread is updating rcv_msg_id >> >> > > while the main thread is reseting this to 0 when it gets a verify msg >> from >> >> amfd. >> >> > > >> >> > > >> >> > > -- >> >> > > >> >> > > uint32_t avnd_evt_avd_verify_evh(AVND_CB *cb, AVND_EVT *evt) { .. >> >> > > >> >> > > >> >> > > TRACE_1("AVD send ID count: %u",info->snd_id_cnt); >> >> > > TRACE_1("AVND receive ID count: %u",cb->rcv_msg_id); >> >> > > >> >> > > >> >> > > /* >> >> > > * Verify message ID received in the message. Send Ack if >> >> > > send ID >> >> > count >> >> > > * received matches with the AVND's receive message ID. Send >> >> > > NACK in case of >> >> > > * mismatch. Reset the receive message ID count. Here after >> >> > > AVD is going to >> >> > > * Start with 0. >> >> > > */ >> >> > > avnd_di_ack_nack_msg_send(cb, info->snd_id_cnt, 0); >> >> > > /* Log error */ >> >> > > >> >> > > >> >> > > /* >> >> > > * We are done with use of rev_msg_id count. Now it is time >> >> > > * re-set it since all new messages we are going to get with >> >> > > * the new counter value. >> >> > > */ >> >> > > cb->rcv_msg_id = 0; >> >> > > >> >> > > >> >> > > .. >> >> > > } >> >> > > >> >> > > >> >> > > >> >> > > >> >> > > >> >> > > On 18/04/2016, 8:50 PM, "Gary Lee" <gary....@dektech.com.au> >> wrote: >> >> > > >> >> > > >Hi Nagu >> >> > > > >> >> > > >I think there might still be race conditions that need to be fixed. >> >> > > > >> >> > > >Seems to be at least two places where rcv_msg_id is reset to 0 in >> >> > > >the main >> >> > > thread, that might interfere with the MDS thread’s use of rcv_msg_id. >> >> > > > >> >> > > >Thanks >> >> > > >Gary >> >> > > > >> >> > > > >> >> > > > >> >> > > >On 12/04/2016, 5:12 PM, "Nagendra Kumar" >> >> <nagendr...@oracle.com> >> >> > > wrote: >> >> > > > >> >> > > >>Hi Hans N, >> >> > > >> Yes, sure. That would be useful. Thanks for the >> information. >> >> > > >> >> > > >> >> >> > > >>-Nagu >> >> > > >> >> >> > > >>> -----Original Message----- >> >> > > >>> From: Hans Nordebäck [mailto:hans.nordeb...@ericsson.com] >> >> > > >>> Sent: 12 April 2016 12:35 >> >> > > >>> To: Nagendra Kumar; Praveen Malviya; >> minh.c...@dektech.com.au; >> >> > > >>> gary....@dektech.com.au >> >> > > >>> Cc: opensaf-devel@lists.sourceforge.net >> >> > > >>> Subject: Re: [PATCH 1 of 1] amfnd: remove receive message id >> >> > > >>> counter >> >> > > from >> >> > > >>> threads [#1728] >> >> > > >>> >> >> > > >>> Hi Nagu, >> >> > > >>> >> >> > > >>> fine, you can also use the valgrind tool helgrind to check for >> >> > > >>> threading issues, e.g in amfnd.conf add: >> >> > > >>> >> >> > > >>> export TOOL="valgrind --tool=helgrind --log- >> >> file=/tmp/amfnd.valgrind" >> >> > > >>> >> >> > > >>> and in /usr/local/lib/opensaf/clc-cli/osaf-amfnd change: >> >> > > >>> >> >> > > >>> #start_daemon -p $pidfile $binary $args >> >> > > >>> $TOOL $binary $args >> >> > > >>> >> >> > > >>> /Thanks HansN >> >> > > >>> >> >> > > >>> >> >> > > >>> >> >> > > >>> On 04/12/2016 08:58 AM, Nagendra Kumar wrote: >> >> > > >>> > Hi Hans N, >> >> > > >>> > I checked avnd_comp_clc_cmd_execute() and found >> >> > that >> >> > > >>> comp->clc_info.exec_cmd is being used and overwritten in this >> >> > function. >> >> > > >>> > Since SU being instantiated in imm reader thread is being >> >> > > >>> > instantiated >> >> > > first >> >> > > >>> time and the components are just being instantiated, so they >> >> > > >>> will not be violating any data access with main thread, where >> >> > > >>> other SUs may be >> >> > > getting >> >> > > >>> instantiating, termination, etc. >> >> > > >>> > After running instantiate command on one of the component, >> any >> >> > > way, the >> >> > > >>> response will be processed from main thread only. So, in one >> >> > > >>> meaning, >> >> > > Imm >> >> > > >>> reader thread is just reading all imm specific information and >> >> > > >>> invoking initialization for one component of SU and ends its job. >> >> > > >>> > >> >> > > >>> > If you find any other specific thing, then please let me know. >> >> > > >>> > >> >> > > >>> > Thanks >> >> > > >>> > -Nagu >> >> > > >>> >> -----Original Message----- >> >> > > >>> >> From: Hans Nordebäck >> [mailto:hans.nordeb...@ericsson.com] >> >> > > >>> >> Sent: 11 April 2016 19:27 >> >> > > >>> >> To: Nagendra Kumar; Praveen Malviya; >> >> > minh.c...@dektech.com.au; >> >> > > >>> >> gary....@dektech.com.au >> >> > > >>> >> Cc: opensaf-devel@lists.sourceforge.net >> >> > > >>> >> Subject: Re: [PATCH 1 of 1] amfnd: remove receive message id >> >> > > counter >> >> > > >>> from >> >> > > >>> >> threads [#1728] >> >> > > >>> >> >> >> > > >>> >> Hi Nagu, >> >> > > >>> >> >> >> > > >>> >> a question, it looks like e.g. avnd_comp_clc_cmd_execute() >> >> > > >>> >> may run >> >> > > in >> >> > > >>> >> parallel wrt the main thread >> >> > > >>> >> and the new ImmReader, not sure but have you checked for >> data >> >> > > races in >> >> > > >>> >> this function? >> >> > > >>> >> >> >> > > >>> >> /Thanks HansN >> >> > > >>> >> >> >> > > >>> >> On 04/11/2016 01:49 PM, nagendr...@oracle.com wrote: >> >> > > >>> >>> osaf/services/saf/amf/amfnd/amfnd.cc | 3 - >> >> > > >>> >>> osaf/services/saf/amf/amfnd/comp.cc | 3 - >> >> > > >>> >>> osaf/services/saf/amf/amfnd/di.cc | 24 --------- >> >> > > >>> >>> osaf/services/saf/amf/amfnd/mds.cc | 89 >> >> > > >>> >> ++++++++++++++++++++++++++++++++++++ >> >> > > >>> >>> osaf/services/saf/amf/amfnd/su.cc | 12 ---- >> >> > > >>> >>> osaf/services/saf/amf/amfnd/susm.cc | 9 --- >> >> > > >>> >>> osaf/services/saf/amf/amfnd/term.cc | 4 - >> >> > > >>> >>> 7 files changed, 89 insertions(+), 55 deletions(-) >> >> > > >>> >>> >> >> > > >>> >>> >> >> > > >>> >>> Since, the message id counter is updated by main thread and >> >> > > >>> >>> imm reader thread simultaneouspy, so there is chance that >> >> > > >>> >>> the counter may be updated in any order and make Amfd and >> >> > > >>> >>> Amfnd counters Out of Order. >> >> > > >>> >>> So, such msg id counter update should be removed from both >> >> > > >>> >>> and should be kep at a common location. >> >> > > >>> >>> This patch fixes the same. >> >> > > >>> >>> >> >> > > >>> >>> diff --git a/osaf/services/saf/amf/amfnd/amfnd.cc >> >> > > >>> >> b/osaf/services/saf/amf/amfnd/amfnd.cc >> >> > > >>> >>> --- a/osaf/services/saf/amf/amfnd/amfnd.cc >> >> > > >>> >>> +++ b/osaf/services/saf/amf/amfnd/amfnd.cc >> >> > > >>> >>> @@ -386,9 +386,6 @@ uint32_t >> >> > > avnd_evt_avd_reboot_evh(AVND_CB >> >> > > >>> >>> >> >> > > >>> >>> osafassert(AVSV_D2N_REBOOT_MSG == evt- >> >info.avd- >> >> > > >msg_type); >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> /* Clear error report related alarms before reboot. >> >> > > >>> >>> TODO: This for loop can be removed if AVD >> remembers >> >> > > >>> >>> and >> >> > > >>> >> checkpoints >> >> > > >>> >>> alarms sent due to error report. >> >> > > >>> >>> diff --git a/osaf/services/saf/amf/amfnd/comp.cc >> >> > > >>> >> b/osaf/services/saf/amf/amfnd/comp.cc >> >> > > >>> >>> --- a/osaf/services/saf/amf/amfnd/comp.cc >> >> > > >>> >>> +++ b/osaf/services/saf/amf/amfnd/comp.cc >> >> > > >>> >>> @@ -2691,9 +2691,6 @@ uint32_t >> >> > > >>> avnd_evt_comp_admin_op_req(AVND >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER2("'%s' op=%u", info->dn.value, info- >> >> > > >oper_id); >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> comp = m_AVND_COMPDB_REC_GET(cb->compdb, >> info- >> >> > > >dn); >> >> > > >>> >>> osafassert( comp != nullptr); >> >> > > >>> >>> >> >> > > >>> >>> 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 >> >> > > >>> >>> @@ -108,9 +108,6 @@ static uint32_t >> >> > avnd_evt_node_admin_op_r >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER2("%s op=%u", info->dn.value, info- >> >oper_id); >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> switch(info->oper_id) { >> >> > > >>> >>> default: >> >> > > >>> >>> LOG_NO("%s: unsupported adm op %u", >> >> > > __FUNCTION__, >> >> > > >>> >> info->oper_id); >> >> > > >>> >>> @@ -200,17 +197,6 @@ uint32_t >> >> > > avnd_evt_avd_operation_request_ >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER2("Class=%u, action=%u", param- >> >class_id, >> >> > > param- >> >> > > >>> >>> act); >> >> > > >>> >>> >> >> > > >>> >>> - /* dont process unless AvD is up */ >> >> > > >>> >>> - if (!m_AVND_CB_IS_AVD_UP(cb)) >> >> > > >>> >>> - goto done; >> >> > > >>> >>> - >> >> > > >>> >>> - // TODO() hide the below code in a "set_msg_id()" >> function >> >> > > >>> >>> - // If message was not broadcasted, (msg_id == 0) >> >> > > >>> >>> - if (info->msg_id != 0) { >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - } >> >> > > >>> >>> - >> >> > > >>> >>> switch (param->class_id) { >> >> > > >>> >>> case AVSV_SA_AMF_NODE: >> >> > > >>> >>> rc = avnd_node_oper_req(cb, param); @@ - >> 260,7 >> >> > +246,6 @@ >> >> > > >>> >>> uint32_t avnd_evt_avd_operation_request_ >> >> > > >>> >>> avnd_msg_content_free(cb, &msg); >> >> > > >>> >>> } >> >> > > >>> >>> >> >> > > >>> >>> -done: >> >> > > >>> >>> TRACE_LEAVE(); >> >> > > >>> >>> return rc; >> >> > > >>> >>> } >> >> > > >>> >>> @@ -1410,20 +1395,11 @@ uint32_t >> >> > > >>> avnd_evt_avd_role_change_evh(AV >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER(); >> >> > > >>> >>> >> >> > > >>> >>> - /* dont process unless AvD is up */ >> >> > > >>> >>> - if (!m_AVND_CB_IS_AVD_UP(cb)){ >> >> > > >>> >>> - LOG_IN("AVD is not up yet"); >> >> > > >>> >>> - return NCSCC_RC_FAILURE; >> >> > > >>> >>> - } >> >> > > >>> >>> - >> >> > > >>> >>> info = &evt->info.avd- >> >msg_info.d2n_role_change_info; >> >> > > >>> >>> >> >> > > >>> >>> TRACE("MsgId: %u,NodeId:%u, role rcvd:%u role >> >> > > present:%u",\ >> >> > > >>> >>> info->msg_id, info->node_id, >> info->role, >> >> > > cb- >> >> > > >>> >>> avail_state_avnd); >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> prev_ha_state = cb->avail_state_avnd; >> >> > > >>> >>> >> >> > > >>> >>> /* Ignore the duplicate roles. */ 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 >> >> > > >>> >>> @@ -300,6 +300,93 @@ done: >> >> > > >>> >>> return rc; >> >> > > >>> >>> } >> >> > > >>> >>> >> >> > > >>> >>> +/** >> >> > > >>> >>> + * @brief This function update the receive msg id with the >> >> > > >>> >>> +msg id >> >> > > sent >> >> > > >>> >>> + * from Amfd. >> >> > > >>> >>> + * @param ptr to avnd_cb. >> >> > > >>> >>> + * @param ptr to evt. >> >> > > >>> >>> + * @return Nothing. >> >> > > >>> >>> + */ >> >> > > >>> >>> +static void update_rcv_msg_id(AVND_CB *cb, AVND_EVT >> *evt) >> >> { >> >> > > >>> >>> + uint32_t msg_id; >> >> > > >>> >>> + switch (evt->type) { >> >> > > >>> >>> + case >> AVND_EVT_AVD_OPERATION_REQUEST_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> >> > > >>> >> AVSV_D2N_OPERATION_REQUEST_MSG_INFO *op_info = >> >> > &evt- >> >> > > >>> >>> info.avd->msg_info.d2n_op_req; >> >> > > >>> >>> + msg_id = op_info->msg_id; >> >> > > >>> >>> + /* dont update the counter >> unless >> >> > > AND is up. >> >> > > >>> >> */ >> >> > > >>> >>> + if >> (!m_AVND_CB_IS_AVD_UP(cb)) >> >> > > >>> >>> + goto done; >> >> > > >>> >>> + >> >> > > >>> >>> + // TODO() hide the below >> code in a >> >> > > >>> >> "set_msg_id()" function >> >> > > >>> >>> + // If message was not >> broadcasted, >> >> > > (msg_id >> >> > > >>> >> == 0) >> >> > > >>> >>> + if (msg_id == 0) >> >> > > >>> >>> + goto done; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case AVND_EVT_AVD_ROLE_CHANGE_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> AVSV_D2N_ROLE_CHANGE_INFO >> >> > > *rc_info = >> >> > > >>> >> &evt->info.avd->msg_info.d2n_role_change_info; >> >> > > >>> >>> + msg_id = rc_info->msg_id; >> >> > > >>> >>> + /* dont update the counter >> unless >> >> > > AND is up. >> >> > > >>> >> */ >> >> > > >>> >>> + if >> (!m_AVND_CB_IS_AVD_UP(cb)) >> >> > > >>> >>> + goto done; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case AVND_EVT_AVD_SU_PRES_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> >> > > AVSV_D2N_PRESENCE_SU_MSG_INFO >> >> > > >>> >> *pres_info = &evt->info.avd->msg_info.d2n_prsc_su; >> >> > > >>> >>> + msg_id = pres_info->msg_id; >> >> > > >>> >>> + /* dont update the counter >> unless >> >> > > AND is up. >> >> > > >>> >> */ >> >> > > >>> >>> + if >> (!m_AVND_CB_IS_AVD_UP(cb)) >> >> > > >>> >>> + return; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case AVND_EVT_AVD_REG_SU_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> AVSV_D2N_REG_SU_MSG_INFO >> >> > > *reg_info = >> >> > > >>> >> &evt->info.avd->msg_info.d2n_reg_su; >> >> > > >>> >>> + msg_id = reg_info->msg_id; >> >> > > >>> >>> + /* dont update the counter >> unless >> >> > > AND is up. >> >> > > >>> >> */ >> >> > > >>> >>> + if >> (!m_AVND_CB_IS_AVD_UP(cb)) >> >> > > >>> >>> + return; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case >> AVND_EVT_AVD_INFO_SU_SI_ASSIGN_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> >> > > AVSV_D2N_INFO_SU_SI_ASSIGN_MSG_INFO >> >> > > >>> >> *susi_info = &evt->info.avd->msg_info.d2n_su_si_assign; >> >> > > >>> >>> + msg_id = susi_info->msg_id; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case AVND_EVT_AVD_SET_LEDS_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> AVSV_D2N_SET_LEDS_MSG_INFO >> >> > > *led_info >> >> > > >>> >> = &evt->info.avd->msg_info.d2n_set_leds; >> >> > > >>> >>> + msg_id = led_info->msg_id; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case >> AVND_EVT_AVD_ADMIN_OP_REQ_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> >> > > AVSV_D2N_ADMIN_OP_REQ_MSG_INFO >> >> > > >>> >> *adm_info = &evt->info.avd- >> >msg_info.d2n_admin_op_req_info; >> >> > > >>> >>> + msg_id = adm_info->msg_id; >> >> > > >>> >>> + } >> >> > > >>> >>> + break; >> >> > > >>> >>> + case AVND_EVT_AVD_REBOOT_MSG: >> >> > > >>> >>> + { >> >> > > >>> >>> + >> AVSV_D2N_REBOOT_MSG_INFO >> >> > > >>> >> *reboot_info = &evt->info.avd->msg_info.d2n_reboot_info; >> >> > > >>> >>> + msg_id = reboot_info- >> >msg_id; >> >> > > >>> >>> + break; >> >> > > >>> >>> + } >> >> > > >>> >>> + default: >> >> > > >>> >>> + goto done; >> >> > > >>> >>> + } >> >> > > >>> >>> + >> >> > > >>> >>> + >> >> > > >>> >>> + avnd_msgid_assert(msg_id); >> >> > > >>> >>> + cb->rcv_msg_id = msg_id; >> >> > > >>> >>> +done: >> >> > > >>> >>> + return; >> >> > > >>> >>> +} >> >> > > >>> >>> + >> >> > > >>> >>> >> >> > > >>> >> >> >> > > >>> >> >> > > >> >> > >> >> >> /************************************************************* >> >> > > >>> >> *************** >> >> > > >>> >>> Name : avnd_mds_rcv >> >> > > >>> >>> >> >> > > >>> >>> @@ -432,6 +519,8 @@ uint32_t avnd_mds_rcv(AVND_CB >> *cb, >> >> > > MDS_C >> >> > > >>> >>> /* nullify the msg as it is used in the event */ >> >> > > >>> >>> memset(&msg, 0, sizeof(AVND_MSG)); >> >> > > >>> >>> >> >> > > >>> >>> + /* Update the receive msg id counter. */ >> >> > > >>> >>> + update_rcv_msg_id(cb, evt); >> >> > > >>> >>> /* send the event */ >> >> > > >>> >>> rc = avnd_evt_send(cb, evt); >> >> > > >>> >>> >> >> > > >>> >>> diff --git a/osaf/services/saf/amf/amfnd/su.cc >> >> > > >>> >> b/osaf/services/saf/amf/amfnd/su.cc >> >> > > >>> >>> --- a/osaf/services/saf/amf/amfnd/su.cc >> >> > > >>> >>> +++ b/osaf/services/saf/amf/amfnd/su.cc >> >> > > >>> >>> @@ -125,15 +125,8 @@ uint32_t >> >> > > avnd_evt_avd_reg_su_evh(AVND_CB >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER(); >> >> > > >>> >>> >> >> > > >>> >>> - /* dont process unless AvD is up */ >> >> > > >>> >>> - if (!m_AVND_CB_IS_AVD_UP(cb)) >> >> > > >>> >>> - goto done; >> >> > > >>> >>> - >> >> > > >>> >>> info = &evt->info.avd->msg_info.d2n_reg_su; >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> /* >> >> > > >>> >>> * Check whether SU updates are received after fail- >> over >> >> > > then >> >> > > >>> >>> * call a separate processing function. >> >> > > >>> >>> @@ -396,8 +389,6 @@ uint32_t >> >> > avnd_evt_avd_info_su_si_assign_ >> >> > > >>> >>> } >> >> > > >>> >>> } >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> >> >> > > >>> >>> if (info->msg_act == AVSV_SUSI_ACT_ASGN) { >> >> > > >>> >>> /* SI rank and CSI capability (originally from >> >> > > SaAmfCtCsType) >> >> > > >>> >>> @@ -622,9 +613,6 @@ uint32_t >> >> > > avnd_evt_su_admin_op_req(AVND_C >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER2("%s op=%u", info->dn.value, info- >> >oper_id); >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> su = m_AVND_SUDB_REC_GET(cb->sudb, info->dn); >> >> > > >>> >>> osafassert(su != nullptr); >> >> > > >>> >>> >> >> > > >>> >>> diff --git a/osaf/services/saf/amf/amfnd/susm.cc >> >> > > >>> >> b/osaf/services/saf/amf/amfnd/susm.cc >> >> > > >>> >>> --- a/osaf/services/saf/amf/amfnd/susm.cc >> >> > > >>> >>> +++ b/osaf/services/saf/amf/amfnd/susm.cc >> >> > > >>> >>> @@ -1277,12 +1277,6 @@ uint32_t >> >> > > >>> avnd_evt_avd_su_pres_evh(AVND_C >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER(); >> >> > > >>> >>> >> >> > > >>> >>> - /* dont process unless AvD is up */ >> >> > > >>> >>> - if (!m_AVND_CB_IS_AVD_UP(cb)) { >> >> > > >>> >>> - TRACE("AVD is not yet up"); >> >> > > >>> >>> - goto done; >> >> > > >>> >>> - } >> >> > > >>> >>> - >> >> > > >>> >>> /* since AMFND is going down no need to process SU >> >> > > >>> >> instantiate/terminate msg >> >> > > >>> >>> * because SU instantiate will cause component >> >> > > >>> >>> information >> >> > > to be >> >> > > >>> >> read from IMMND >> >> > > >>> >>> * and IMMND might have been already terminated >> and in >> >> > > that case >> >> > > >>> >> AMFND will osafassert */ >> >> > > >>> >>> @@ -1293,9 +1287,6 @@ uint32_t >> >> > > avnd_evt_avd_su_pres_evh(AVND_C >> >> > > >>> >>> >> >> > > >>> >>> info = &evt->info.avd->msg_info.d2n_prsc_su; >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> /* get the su */ >> >> > > >>> >>> su = m_AVND_SUDB_REC_GET(cb->sudb, info- >> >su_name); >> >> > > >>> >>> if (!su) { >> >> > > >>> >>> diff --git a/osaf/services/saf/amf/amfnd/term.cc >> >> > > >>> >> b/osaf/services/saf/amf/amfnd/term.cc >> >> > > >>> >>> --- a/osaf/services/saf/amf/amfnd/term.cc >> >> > > >>> >>> +++ b/osaf/services/saf/amf/amfnd/term.cc >> >> > > >>> >>> @@ -196,14 +196,10 @@ done: >> >> > > >>> >>> >> >> > > >>> >> >> >> > > >>> >> >> > > >> >> > >> >> >> ************************************************************** >> >> > > >>> >> ****************/ >> >> > > >>> >>> uint32_t avnd_evt_avd_set_leds_evh(AVND_CB *cb, >> >> AVND_EVT >> >> > > *evt) >> >> > > >>> >>> { >> >> > > >>> >>> - AVSV_D2N_SET_LEDS_MSG_INFO *info = &evt- >> >info.avd- >> >> > > >>> >>> msg_info.d2n_set_leds; >> >> > > >>> >>> uint32_t rc = NCSCC_RC_SUCCESS; >> >> > > >>> >>> >> >> > > >>> >>> TRACE_ENTER(); >> >> > > >>> >>> >> >> > > >>> >>> - avnd_msgid_assert(info->msg_id); >> >> > > >>> >>> - cb->rcv_msg_id = info->msg_id; >> >> > > >>> >>> - >> >> > > >>> >>> if (cb->led_state == AVND_LED_STATE_GREEN) { >> >> > > >>> >>> /* Nothing to be done we have already got >> this msg >> >> > > */ >> >> > > >>> >>> goto done; >> >> > > >>> >> >> > > >>> >> >> > > >> >> >> >> ------------------------------------------------------------------------------ >> >> 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 >> >> Opensaf-devel@lists.sourceforge.net >> >> https://lists.sourceforge.net/lists/listinfo/opensaf-devel ------------------------------------------------------------------------------ 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 Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
