Ack Thanks -Nagu
> -----Original Message----- > From: Minh Hon Chau [mailto:[email protected]] > Sent: 07 May 2014 10:09 > To: [email protected]; [email protected]; Praveen Malviya; > Nagendra Kumar > Cc: [email protected] > Subject: [PATCH 1 of 1] v3 amfnd: saAmfSGCompRestartProb timer is not > stopped after the relevant model had been deleted [#831] > > osaf/services/saf/amf/amfnd/susm.cc | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > > Problem: If the timer is started, delete the model, load model again, > and kill component in order to escalate to the su restart. Then if the > previous timer event comes during the escalation, it will reset component > restart counter. So there will be no su restart at the end. The similiar > problem > also happens in case of saAmfSGSuRestartProb. > > Change: Stop both timer saAmfSGCompRestartProb and saAmfSGSuRestartProb > (if it started) > in the sequence of lock-in su > > 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 > @@ -1236,6 +1236,19 @@ uint32_t avnd_evt_avd_su_pres_evh(AVND_C > > switch (info->term_state) { > case true: /* => terminate the su */ > + /* Stop saAmfSGSuRestartProb timer if started */ > + if (su->su_err_esc_level == AVND_ERR_ESC_LEVEL_1) { > + m_AVND_TMR_SU_ERR_ESC_STOP(cb, su); > + m_AVND_SEND_CKPT_UPDT_ASYNC_UPDT(cb, su, > AVND_CKPT_SU_ERR_ESC_TMR); > + } > + /* Stop saAmfSGCompRestartProb timer if started */ > + else if (su->su_err_esc_level == AVND_ERR_ESC_LEVEL_0) { > + m_AVND_TMR_COMP_ERR_ESC_STOP(cb, su); > + m_AVND_SEND_CKPT_UPDT_ASYNC_UPDT(cb, su, > AVND_CKPT_SU_ERR_ESC_TMR); > + } > + else > + TRACE("su_err_esc_tmr is started in wrong > su_err_esc_level(%d)", su->su_err_esc_level); > + > TRACE("SU term state is set to true"); > /* no si must be assigned to the su */ > osafassert(!m_NCS_DBLIST_FIND_FIRST(&su->si_list)); ------------------------------------------------------------------------------ Is your legacy SCM system holding you back? Join Perforce May 7 to find out: • 3 signs your SCM is hindering your productivity • Requirements for releasing software faster • Expert tips and advice for migrating your SCM now http://p.sf.net/sfu/perforce _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
