osaf/services/saf/amf/amfnd/di.cc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Reboot the node immediately if local amfd goes down, even if headless
mode is enabled. Otherwise we need to wait for the AMF heartbeat timeout to
occur before rebooting the node, which is unnecessary.
diff --git a/osaf/services/saf/amf/amfnd/di.cc
b/osaf/services/saf/amf/amfnd/di.cc
--- a/osaf/services/saf/amf/amfnd/di.cc
+++ b/osaf/services/saf/amf/amfnd/di.cc
@@ -595,6 +595,7 @@ uint32_t avnd_evt_mds_avd_dn_evh(AVND_CB
/* Ignore the other AVD Adest Down.*/
if(evt->info.mds.mds_dest == cb->active_avd_adest)
avnd_cb->cont_reboot_in_progress = true;
+ TRACE_LEAVE();
return rc;
}
}
@@ -604,7 +605,9 @@ uint32_t avnd_evt_mds_avd_dn_evh(AVND_CB
LOG_WA("AMF director unexpectedly crashed");
- if (cb->scs_absence_max_duration == 0) {
+ // if headless is disabled OR if the amfd down came from the local
node, just reboot
+ if (cb->scs_absence_max_duration == 0 ||
+ evt->info.mds.node_id == ncs_get_node_id()) {
/* Don't issue reboot if it has been already issued.*/
if (false == cb->reboot_in_progress) {
cb->reboot_in_progress = true;
------------------------------------------------------------------------------
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. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
