In the floated patch for #601 below mentioned log message is removed. After this patch do we require the removal of log message in #601 patch.
Thanks, Praveen On 24-Jan-14 12:23 PM, Hans Feldt wrote: > osaf/services/saf/amf/amfnd/su.cc | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > > When SGAutoRepair is enabled and performed the following syslog can be > observed: > > Jan 24 07:41:57 Vostro osafamfnd[17227]: ER cannot unlink failed state > file /var/run/opensaf/amf_failed_state: No such file or directory > > The same happens when repairing an SU in INSTANTIATION-FAILED state. > > The reason for this that the failed-state file removal is done in all cases. > > The patch protects the failed-state file removal so that it is only done in > the > case of the SU being in presence state TERMINATION-FAILED (which is the only > state the file can exist in). > > 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 > @@ -493,14 +493,16 @@ uint32_t avnd_evt_su_admin_op_req(AVND_C > avnd_di_uns32_upd_send(AVSV_SA_AMF_COMP, > saAmfCompOperState_ID, &comp->name, comp->oper); > } > > + if ((su->pres == SA_AMF_PRESENCE_TERMINATION_FAILED) && > + (comp_in_term_failed_state() == false)) > + avnd_failed_state_file_delete(); > + > m_AVND_SU_STATE_RESET(su); > m_AVND_SU_OPER_STATE_SET(su, SA_AMF_OPERATIONAL_ENABLED); > avnd_di_uns32_upd_send(AVSV_SA_AMF_SU, saAmfSUOperState_ID, > &su->name, su->oper); > avnd_su_pres_state_set(su, SA_AMF_PRESENCE_UNINSTANTIATED); > rc = avnd_di_oper_send(cb, su, 0); > > - if (!comp_in_term_failed_state()) > - avnd_failed_state_file_delete(); > > break; > } ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
