AMFND should send sync state as after headless if see new active
AMFD from same node.
---
 src/amf/amfnd/di.cc  | 3 ++-
 src/amf/amfnd/mds.cc | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amf/amfnd/di.cc b/src/amf/amfnd/di.cc
index 5bff12104..507684eab 100644
--- a/src/amf/amfnd/di.cc
+++ b/src/amf/amfnd/di.cc
@@ -665,7 +665,8 @@ uint32_t avnd_evt_mds_avd_up_evh(AVND_CB *cb, AVND_EVT 
*evt) {
      * only want to send node_up/sync info in case of recovery.
      */
     if (evt->info.mds.i_change == NCSMDS_NEW_ACTIVE && cb->is_avd_down) {
-      if (cb->led_state == AVND_LED_STATE_GREEN) {
+      if ((cb->led_state == AVND_LED_STATE_GREEN) ||
+          (evt->info.mds.node_id == cb->node_info.nodeId)) {
         // node_up, sync sisu, compcsi info to AVND for recovery
         avnd_sync_sisu(cb);
         avnd_sync_csicomp(cb);
diff --git a/src/amf/amfnd/mds.cc b/src/amf/amfnd/mds.cc
index 86d207c29..89c75eaeb 100644
--- a/src/amf/amfnd/mds.cc
+++ b/src/amf/amfnd/mds.cc
@@ -531,6 +531,7 @@ uint32_t avnd_mds_svc_evt(AVND_CB *cb, 
MDS_CALLBACK_SVC_EVENT_INFO *evt_info) {
         evt = avnd_evt_create(cb, AVND_EVT_MDS_AVD_UP, 0, &evt_info->i_dest, 0,
                               0, 0);
         evt->info.mds.i_change = evt_info->i_change;
+        evt->info.mds.node_id = evt_info->i_node_id;
       }
       break;
     case NCSMDS_UP:
-- 
2.25.1



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

Reply via email to