osaf/services/saf/amf/amfnd/clc.cc |  22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)


When opensafd is shutting down, the cleanup succ event
of component should be ignored because, there is no
further event need to occur for another comp ot su.

diff --git a/osaf/services/saf/amf/amfnd/clc.cc 
b/osaf/services/saf/amf/amfnd/clc.cc
--- a/osaf/services/saf/amf/amfnd/clc.cc
+++ b/osaf/services/saf/amf/amfnd/clc.cc
@@ -809,6 +809,28 @@ uint32_t avnd_comp_clc_fsm_run(AVND_CB *
                }
        }
 
+       if ((cb->term_state == AVND_TERM_STATE_OPENSAF_SHUTDOWN_STARTED) &&
+                       m_AVND_SU_IS_PREINSTANTIABLE(comp->su) &&
+                       (!m_AVND_COMP_TYPE_IS_PREINSTANTIABLE(comp)) &&
+                       (comp->pres == SA_AMF_PRESENCE_TERMINATING)) {
+               TRACE("Term state is SHUTDOWN STARTED, event '%s'", 
pres_state_evt[ev]);
+               switch (ev) {
+                       case AVND_COMP_CLC_PRES_FSM_EV_CLEANUP_SUCC:
+                               avnd_comp_pres_state_set(cb, comp, 
SA_AMF_PRESENCE_UNINSTANTIATED);
+                               if (all_comps_terminated()) {
+                                       LOG_NO("Terminated all AMF components");
+                                       LOG_NO("Shutdown completed, exiting");
+                                       exit(0);
+                               } else {
+                                       TRACE("Do nothing");
+                                       goto done;
+                               }
+                       default:
+                               LOG_ER("Ignoring event '%s' for '%s' during 
node shutdown",
+                                               pres_state_evt[ev], 
comp->name.value);
+                               goto done;
+               }
+       }
        /* get the prv presence state */
        prv_st = comp->pres;
 

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to