Hi Thuan,

Ack from me (not tested).

B.R/Thang

-----Original Message-----
From: Thuan Tran <thuan.t...@dektech.com.au> 
Sent: Monday, March 9, 2020 1:08 PM
To: Thang Duc Nguyen <thang.d.ngu...@dektech.com.au>; Minh Hon Chau 
<minh.c...@dektech.com.au>; Gary Lee <gary....@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net; Thuan Tran <thuan.t...@dektech.com.au>
Subject: [PATCH 1/1] amfnd: fix unexpected reboot after split-brain recovery 
[#3162]

- Split-brain recovery in headless enable, IMMND may expected restart.
If AMFND not wait IMMND restart but reinit CLM, CLM callback trigger,
clm_to_amf_node() is called then AMFND stuck in init IMM OM causes delay 
restart IMMND, delay resend node_up then AMFD will order reboot node.
- Only call clm_to_amf_node() if amf node name is empty.
---
 src/amf/amfnd/clm.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amf/amfnd/clm.cc b/src/amf/amfnd/clm.cc index 
06eb229c7..73c8ff83c 100644
--- a/src/amf/amfnd/clm.cc
+++ b/src/amf/amfnd/clm.cc
@@ -250,7 +250,7 @@ static void clm_track_cb(
           memcpy(&(avnd_cb->node_info), &(notifItem->clusterNode),
                  sizeof(SaClmClusterNodeT_4));
           /*get the amf node from clm node name */
-          clm_to_amf_node();
+          if (avnd_cb->amf_nodeName.empty()) clm_to_amf_node();
           avnd_send_node_up_msg();
           avnd_cb->first_time_up = false;
         }
--
2.17.1



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

Reply via email to