Hi Gary,
Ack, code review only/Thanks HansN
-----Original Message-----
From: Gary Lee [mailto:[email protected]]
Sent: den 25 oktober 2016 04:24
To: Hans Nordebäck <[email protected]>; [email protected];
[email protected]; Minh Hon Chau <[email protected]>
Cc: [email protected]
Subject: [PATCH 1 of 1] amfnd: ignore healthcheck failure if comp is
terminating [#1950]
osaf/services/saf/amf/amfnd/err.cc | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
If there is an outstanding healthcheck in progress when a component is ordered
to terminate, then the healthcheck can't be expected to succeed. In this case,
we should not order a cleanup of the component and allow the termination to
occur.
diff --git a/osaf/services/saf/amf/amfnd/err.cc
b/osaf/services/saf/amf/amfnd/err.cc
--- a/osaf/services/saf/amf/amfnd/err.cc
+++ b/osaf/services/saf/amf/amfnd/err.cc
@@ -368,6 +368,11 @@ uint32_t avnd_err_process(AVND_CB *cb, A
goto done;
if (m_AVND_COMP_PRES_STATE_IS_TERMINATING(comp)) {
+ if (err_info->src == AVND_ERR_SRC_HC) {
+ LOG_NO("healthcheck failure ignored as '%s' is
terminating", comp->name.c_str());
+ // ignore if healthcheck failed during terminating state
+ goto done;
+ }
// special treat failures while terminating, no escalation just
cleanup
LOG_NO("'%s' faulted due to '%s' : Recovery is 'cleanup'",
comp->name.c_str(), g_comp_err[err_info->src]);
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
