osaf/services/saf/amf/amfnd/su.cc | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
Currently avnd_su_curr_info_del() is called in three places:
(1). su restart recovery
(2). su restart by admin op
(3). su is terminated by su_pres_msg
In case (1), (2), the code that reset SU's oper_state as DISABLED won't
be called. Only in (3), which lock-in SU (or node/ng) which SU is not
failed, that reset SU's oper_state as DISABLED. This will set local
variable @su->oper as DISABLED while SU OperationalState in amfd and
imm as ENABLED. This reset is not needed since if SU is healthy, its
oper state should be ENABLED. And this reset will cause SU won't be able
to recover after headless if there was a lock-in SU (node/ng) done before
headless.
Patch removes this reset of SU as DISABLED.
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
@@ -572,11 +572,6 @@ uint32_t avnd_su_curr_info_del(AVND_CB *
su->su_restart_cnt = 0;
avnd_di_uns32_upd_send(AVSV_SA_AMF_SU, saAmfSURestartCount_ID,
&su->name, su->su_restart_cnt);
/* stop su_err_esc_tmr TBD Later */
-
- /* disable the oper state (if pi su) */
- if (m_AVND_SU_IS_PREINSTANTIABLE(su) && (su->admin_op_Id !=
SA_AMF_ADMIN_RESTART)) {
- m_AVND_SU_OPER_STATE_SET(su,
SA_AMF_OPERATIONAL_DISABLED);
- }
}
/* scan & delete the current info store in each component */
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
