#2476 amfnd: SURestart recovery leaves SU DISABLED/OUT_OF_SERVICE

[Minh Hon Chau]

• Start 2N amf_demo application with configuration of SuRestart recovery.
• Kill amf_demo to escalate to SURestart recovery
• Recovery is done successfully
• Checking SU states, SU is still DISABLED, OUT_OF_SERVICE, but the SU has assignments

syslog:
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO 'safComp=AmfDemo2,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' faulted due to 'avaDown' : Recovery is 'suRestart'
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' Presence State INSTANTIATED => TERMINATING
2017-06-01 23:34:12 PL-4 amf_demo_script: sleep 5s at stop cmd
2017-06-01 23:34:12 PL-4 amf_demo_script: sleep 5s at stop cmd
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' Presence State TERMINATING => UNINSTANTIATED
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' Presence State UNINSTANTIATED => INSTANTIATING
2017-06-01 23:34:12 PL-4 amf_demo_script: safComp=AmfDemo2,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon
2017-06-01 23:34:12 PL-4 amf_demo[366]: 'safComp=AmfDemo2,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' started
2017-06-01 23:34:12 PL-4 amf_demo_script: sleep 5s at start cmd
2017-06-01 23:34:12 PL-4 amf_demo[366]: before saAmfComponentRegister [safComp=AmfDemo2,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon]
2017-06-01 23:34:12 PL-4 amf_demo[366]: after saAmfComponentRegister
2017-06-01 23:34:12 PL-4 amf_demo[366]: Registered with AMF and HC started
2017-06-01 23:34:12 PL-4 amf_demo[366]: Health check 1
2017-06-01 23:34:12 PL-4 amf_demo_script: safComp=AmfDemo,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon
2017-06-01 23:34:12 PL-4 amf_demo[380]: 'safComp=AmfDemo,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' started
2017-06-01 23:34:12 PL-4 amf_demo_script: sleep 5s at start cmd
2017-06-01 23:34:12 PL-4 amf_demo[380]: before saAmfComponentRegister [safComp=AmfDemo,safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon]
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' Presence State INSTANTIATING => INSTANTIATED
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO Assigning 'safSi=AmfDemoTwon,safApp=AmfDemoTwon' ACTIVE to 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon'
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO Assigning 'safSi=AmfDemoTwonDep1,safApp=AmfDemoTwon' ACTIVE to 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon'
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO Assigning 'safSi=AmfDemoTwonDep2,safApp=AmfDemoTwon' ACTIVE to 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon'
2017-06-01 23:34:12 PL-4 amf_demo[380]: after saAmfComponentRegister
2017-06-01 23:34:12 PL-4 amf_demo[380]: Registered with AMF and HC started
2017-06-01 23:34:12 PL-4 amf_demo[380]: CSI Set - add 'safCsi=AmfDemoTwon,safSi=AmfDemoTwon,safApp=AmfDemoTwon' HAState Active
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO Assigned 'safSi=AmfDemoTwon,safApp=AmfDemoTwon' ACTIVE to 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon'
2017-06-01 23:34:12 PL-4 amf_demo[380]: CSI Set - add 'safCsi=AmfDemoTwonDep1,safSi=AmfDemoTwonDep1,safApp=AmfDemoTwon' HAState Active
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO Assigned 'safSi=AmfDemoTwonDep1,safApp=AmfDemoTwon' ACTIVE to 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon'
2017-06-01 23:34:12 PL-4 amf_demo[380]: CSI Set - add 'safCsi=AmfDemoTwonDep2,safSi=AmfDemoTwonDep2,safApp=AmfDemoTwon' HAState Active
2017-06-01 23:34:12 PL-4 osafamfnd[186]: NO Assigned 'safSi=AmfDemoTwonDep2,safApp=AmfDemoTwon' ACTIVE to 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon'
2017-06-01 23:34:12 PL-4 amf_demo[380]: Health check 1
2017-06-01 23:34:22 PL-4 osafamfnd[186]: NO 'safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon' Component or SU restart probation timer expired

amf-state su:

safSu=SU4,safSg=AmfDemoTwon,safApp=AmfDemoTwon
saAmfSUAdminState=UNLOCKED(1)
saAmfSUOperState=DISABLED(2)
saAmfSUPresenceState=INSTANTIATED(3)
saAmfSUReadinessState=OUT-OF-SERVICE(1)
safSu=SU5,safSg=AmfDemoTwon,safApp=AmfDemoTwon
saAmfSUAdminState=UNLOCKED(1)
saAmfSUOperState=ENABLED(1)
saAmfSUPresenceState=INSTANTIATED(3)
saAmfSUReadinessState=IN-SERVICE(2)
safSu=SU5B,safSg=AmfDemoTwon,safApp=AmfDemoTwon
saAmfSUAdminState=LOCKED-INSTANTIATION(3)
saAmfSUOperState=ENABLED(1)
saAmfSUPresenceState=UNINSTANTIATED(1)
saAmfSUReadinessState=OUT-OF-SERVICE(1)

[Minh Hon Chau]

One change recently seemed to introduce this bug coming from #2144

@@ -701,6 +707,8 @@ uint32_t avnd_err_rcvr_su_restart(AVND_C
if (NCSCC_RC_SUCCESS != rc)
goto done;

• avnd_di_uns32_upd_send(AVSV_SA_AMF_SU, saAmfSUOperState_ID, su->name, su->oper);
  +
  set_suRestart_flag(su);

At beginning of surestart recovery, amfnd resported to amfd the SU becoming DISABLED, but didn't report back to amfd as ENABLED when recovery completed

[Minh Hon Chau]

Hi Alex,

If the below change does not cause any problem to the feature of #2144, I'd like to use it as a fix for this ticket.

diff --git a/src/amf/amfnd/err.cc b/src/amf/amfnd/err.cc
index 2abaf20..ff86bc4 100644
--- a/src/amf/amfnd/err.cc
+++ b/src/amf/amfnd/err.cc
@@ -707,9 +707,6 @@ uint32_t avnd_err_rcvr_su_restart(AVND_CB *cb, AVND_SU *su,
   uint32_t rc = avnd_comp_oper_state_avd_sync(cb, failed_comp);
   if (NCSCC_RC_SUCCESS != rc) goto done;

-  avnd_di_uns32_upd_send(AVSV_SA_AMF_SU, saAmfSUOperState_ID, su->name,
-                         su->oper);
-
   set_suRestart_flag(su);

   if (su_all_comps_restartable(*su) == true) {

Your thought?

Thanks,
Minh