[devel] [PATCH 1/1] amf: should not run check_nodes_after_reinit_imm() out of main [#2972]

[thuan.tran]

---
 src/amf/amfd/imm.cc  | 4 ----
 src/amf/amfd/main.cc | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/amf/amfd/imm.cc b/src/amf/amfd/imm.cc
index e990288..82d2b13 100644
--- a/src/amf/amfd/imm.cc
+++ b/src/amf/amfd/imm.cc
@@ -41,7 +41,6 @@
 #include "amf/common/amf_defs.h"
 #include "amf/amfd/imm.h"
 #include "amf/amfd/cluster.h"
-#include "amf/amfd/node.h"
 #include "amf/amfd/app.h"
 #include "amf/amfd/sgtype.h"
 #include "amf/amfd/sg.h"
@@ -2133,8 +2132,6 @@ static void *avd_imm_reinit_bg_thread(void *_cb) {
 
   immutilWrapperProfile.errorsAreFatal = 0;
 
-  /* Try to dispatch imm cb if any, e.g: apply cb, before finalize OI */
-  (void)saImmOiDispatch(avd_cb->immOiHandle, SA_DISPATCH_ALL);
   while (++no_of_retries < MAX_NO_RETRIES) {
     (void)saImmOiFinalize(avd_cb->immOiHandle);
 
@@ -2170,7 +2167,6 @@ static void *avd_imm_reinit_bg_thread(void *_cb) {
         osaf_mutex_unlock_ordie(&imm_reinit_mutex);
         exit(EXIT_FAILURE);
       }
-      avd_check_nodes_after_reinit_imm();
     } else {
       /* become applier and re-read the config */
       rc = avd_imm_applier_set();
diff --git a/src/amf/amfd/main.cc b/src/amf/amfd/main.cc
index b8f5c22..563dea5 100644
--- a/src/amf/amfd/main.cc
+++ b/src/amf/amfd/main.cc
@@ -51,6 +51,7 @@
 #include "amf/amfd/amfd.h"
 #include "amf/amfd/imm.h"
 #include "amf/amfd/cluster.h"
+#include "amf/amfd/node.h"
 #include "amf/amfd/si_dep.h"
 #include "amf/amfd/hlt.h"
 #include "amf/amfd/clm.h"
@@ -682,6 +683,7 @@ static void main_loop(void) {
 
       if (evt->rcv_evt == AVD_IMM_REINITIALIZED) {
         cb->avd_imm_status = AVD_IMM_INIT_DONE;
+        avd_check_nodes_after_reinit_imm();
         TRACE("Received IMM reinit msg");
         polltmo = retval_to_polltmo(Fifo::execute(cb));
         continue;
-- 
2.7.4



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