Hi Thang,

Just one minor comment that commit message should revise.

"amfnd: reset SU restart flag in COMP failover context [#3135]

When SU restart is escalated to component failover, reset the SU restart flag."

Best Regards,
ThuanTr

-----Original Message-----
From: thang.d.nguyen <thang.d.ngu...@dektech.com.au> 
Sent: Monday, December 30, 2019 9:30 AM
To: gary....@dektech.com.au; thuan.t...@dektech.com.au
Cc: opensaf-devel@lists.sourceforge.net; thang.d.nguyen 
<thang.d.ngu...@dektech.com.au>
Subject: [PATCH 1/1] amfnd: reset restart flag in failover context [#3135]

When SU reStart is escalated to component failoverReset
the restart flag need resetting.
---
 src/amf/amfnd/err.cc  | 4 +++-
 src/amf/amfnd/susm.cc | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/amf/amfnd/err.cc b/src/amf/amfnd/err.cc
index db3baabc7..65cc3a5c3 100644
--- a/src/amf/amfnd/err.cc
+++ b/src/amf/amfnd/err.cc
@@ -879,8 +879,10 @@ uint32_t avnd_err_rcvr_comp_failover(AVND_CB *cb, 
AVND_COMP *failed_comp) {
 
   /* We are now in the context of failover, forget the reset restart admin op
    * id*/
-  if (m_AVND_SU_IS_RESTART(su))
+  if (m_AVND_SU_IS_RESTART(su)) {
+    reset_suRestart_flag(su);
     su->admin_op_Id = static_cast<SaAmfAdminOperationIdT>(0);
+  }
 
   // TODO: there should be no difference between PI/NPI comps
   if (m_AVND_SU_IS_PREINSTANTIABLE(su)) {
diff --git a/src/amf/amfnd/susm.cc b/src/amf/amfnd/susm.cc
index c1aa9e44b..86811f1e4 100644
--- a/src/amf/amfnd/susm.cc
+++ b/src/amf/amfnd/susm.cc
@@ -947,7 +947,8 @@ static bool susi_operation_in_progress(AVND_SU *su, 
AVND_SU_SI_REC *si) {
                           &t_csi->si_dll_node)) {
             if (m_AVND_COMP_IS_FAILED(t_csi->comp) ||
                 (su->pres == SA_AMF_PRESENCE_INSTANTIATION_FAILED) ||
-                (su->pres == SA_AMF_PRESENCE_TERMINATION_FAILED))
+                (su->pres == SA_AMF_PRESENCE_TERMINATION_FAILED) ||
+                !m_AVND_COMP_IS_REG(t_csi->comp))
               continue;
             else if (m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_ASSIGNING(t_csi) ||
                      m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_REMOVING(t_csi) ||
-- 
2.17.1




_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to