Ack. Thanks -Nagu
> -----Original Message----- > From: Minh Hon Chau [mailto:minh.c...@dektech.com.au] > Sent: 17 August 2016 09:53 > To: hans.nordeb...@ericsson.com; Nagendra Kumar; Praveen Malviya; > gary....@dektech.com.au; minh.c...@dektech.com.au > Cc: opensaf-devel@lists.sourceforge.net > Subject: [PATCH 1 of 1] AMFD: Correct setting SU in-server [#1938] > > osaf/services/saf/amf/amfd/ndproc.cc | 4 ---- > osaf/services/saf/amf/amfd/sgproc.cc | 14 -------------- > 2 files changed, 0 insertions(+), 18 deletions(-) > > > In SU repair scenario, the SU readiness state is currently set to IN_SERVICE > in > avd_data_update_req_evh(). And later on, > avd_su_oper_state_evh() sets SU readiness state back to OUT_OF_SERVICE. > This logic is redundant and SU readiness state should not be set while > updating SU' oper state to align with non-headless logic. > > Patch removes that incorrect setting of SU's readiness state > > diff --git a/osaf/services/saf/amf/amfd/ndproc.cc > b/osaf/services/saf/amf/amfd/ndproc.cc > --- a/osaf/services/saf/amf/amfd/ndproc.cc > +++ b/osaf/services/saf/amf/amfd/ndproc.cc > @@ -976,10 +976,6 @@ void avd_data_update_req_evh(AVD_CL_CB * > su->set_oper_state(l_val); > } > > - if (su->is_in_service() == true) { > - su- > >set_readiness_state(SA_AMF_READINESS_IN_SERVICE); > - } > - > break; > case saAmfSUPresenceState_ID: > TRACE("su pres state"); > diff --git a/osaf/services/saf/amf/amfd/sgproc.cc > b/osaf/services/saf/amf/amfd/sgproc.cc > --- a/osaf/services/saf/amf/amfd/sgproc.cc > +++ b/osaf/services/saf/amf/amfd/sgproc.cc > @@ -885,20 +885,6 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb > } > } > } else { /* if(su->sg_of_su->sg_ncs_spec == true) */ > - if (avd_cb->scs_absence_max_duration > 0 && > - su->saAmfSUPresenceState == > SA_AMF_PRESENCE_UNINSTANTIATED && > - su->saAmfSUPreInstantiable == false) { > - // this is to allow non NPI SUs to be repaired > if > - // headless mode is enabled. Otherwise, the > code > - // following will assume the SU is already in > service > - // when it failed to instantiate while headless > - > - if (cb->init_state == AVD_APP_STATE) { > - LOG_NO("Setting NPI SU '%s' to OOS > after headless state", su->name.value); > - su- > >set_readiness_state(SA_AMF_READINESS_OUT_OF_SERVICE); > - } > - } > - > /* If oper state of Uninstantiated SU got ENABLED so > try to instantiate it > after evaluating SG. */ > if (su->saAmfSUPresenceState == > SA_AMF_PRESENCE_UNINSTANTIATED) { ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
