AMFND should not reboot node if see AMFD crash during shutdown
---
 src/amf/amfnd/main.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/amf/amfnd/main.cc b/src/amf/amfnd/main.cc
index 6d9ee95d4..e0ede1161 100644
--- a/src/amf/amfnd/main.cc
+++ b/src/amf/amfnd/main.cc
@@ -608,12 +608,14 @@ void avnd_main_process(void) {
     }
 
     if (fds[FD_AMFD_FIFO].revents & POLLERR) {
-      LOG_ER("AMFD has unexpectedly crashed. Rebooting node");
-      opensaf_reboot(
-          avnd_cb->node_info.nodeId,
-          osaf_extended_name_borrow(&avnd_cb->node_info.executionEnvironment),
-          "AMFD has unexpectedly crashed. Rebooting node");
-      exit(0);
+      if (!m_AVND_IS_SHUTTING_DOWN(avnd_cb)) {
+        LOG_ER("AMFD has unexpectedly crashed. Rebooting node");
+        opensaf_reboot(
+            avnd_cb->node_info.nodeId,
+            
osaf_extended_name_borrow(&avnd_cb->node_info.executionEnvironment),
+            "AMFD has unexpectedly crashed. Rebooting node");
+        exit(0);
+      }
     }
 
     if (avnd_cb->clmHandle && (fds[FD_CLM].revents & POLLIN)) {
-- 
2.17.1



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

Reply via email to