|
 |
646f31 |
From 824fe834c67fb7bae7feb87607381f9fa8fa2945 Mon Sep 17 00:00:00 2001
|
|
|
646f31 |
From: Klaus Wenninger <klaus.wenninger@aon.at>
|
|
|
646f31 |
Date: Fri, 7 Jun 2019 19:09:06 +0200
|
|
|
646f31 |
Subject: [PATCH] Fix: sbd-pacemaker: assume graceful exit if leftovers are
|
|
|
646f31 |
unmanged
|
|
|
646f31 |
|
|
|
646f31 |
---
|
|
|
646f31 |
src/sbd-pacemaker.c | 32 +++++++++++++++++++++++++++++++-
|
|
|
646f31 |
1 file changed, 31 insertions(+), 1 deletion(-)
|
|
|
646f31 |
|
|
|
646f31 |
diff --git a/src/sbd-pacemaker.c b/src/sbd-pacemaker.c
|
|
|
646f31 |
index 9a8b95f..2b35ff6 100644
|
|
|
646f31 |
--- a/src/sbd-pacemaker.c
|
|
|
646f31 |
+++ b/src/sbd-pacemaker.c
|
|
|
646f31 |
@@ -333,11 +333,41 @@ compute_status(pe_working_set_t * data_set)
|
|
|
646f31 |
}
|
|
|
646f31 |
}
|
|
|
646f31 |
|
|
|
646f31 |
+ /* If we are in shutdown-state once this will go on till the end.
|
|
|
646f31 |
+ * If we've on top reached a state of 0 locally running resources
|
|
|
646f31 |
+ * we can assume a clean shutdown.
|
|
|
646f31 |
+ * Tricky are the situations where the node is in maintenance-mode
|
|
|
646f31 |
+ * or resources are unmanaged. So if the node is in maintenance or
|
|
|
646f31 |
+ * all left-over running resources are unmanaged we assume intention.
|
|
|
646f31 |
+ */
|
|
|
646f31 |
if (node->details->shutdown) {
|
|
|
646f31 |
pcmk_shutdown = 1;
|
|
|
646f31 |
}
|
|
|
646f31 |
- if (pcmk_shutdown && !(node->details->running_rsc)) {
|
|
|
646f31 |
+ if (pcmk_shutdown)
|
|
|
646f31 |
+ {
|
|
|
646f31 |
pcmk_clean_shutdown = 1;
|
|
|
646f31 |
+ if (!(node->details->maintenance)) {
|
|
|
646f31 |
+ GListPtr iter;
|
|
|
646f31 |
+
|
|
|
646f31 |
+ for (iter = node->details->running_rsc;
|
|
|
646f31 |
+ iter != NULL; iter = iter->next) {
|
|
|
646f31 |
+ resource_t *rsc = (resource_t *) iter->data;
|
|
|
646f31 |
+
|
|
|
646f31 |
+
|
|
|
646f31 |
+ if (is_set(rsc->flags, pe_rsc_managed)) {
|
|
|
646f31 |
+ pcmk_clean_shutdown = 0;
|
|
|
646f31 |
+ crm_debug("not clean as %s managed and still running",
|
|
|
646f31 |
+ rsc->id);
|
|
|
646f31 |
+ break;
|
|
|
646f31 |
+ }
|
|
|
646f31 |
+ }
|
|
|
646f31 |
+ if (pcmk_clean_shutdown) {
|
|
|
646f31 |
+ crm_debug("pcmk_clean_shutdown because "
|
|
|
646f31 |
+ "all managed resources down");
|
|
|
646f31 |
+ }
|
|
|
646f31 |
+ } else {
|
|
|
646f31 |
+ crm_debug("pcmk_clean_shutdown because node is in maintenance");
|
|
|
646f31 |
+ }
|
|
|
646f31 |
}
|
|
|
646f31 |
notify_parent();
|
|
|
646f31 |
return;
|
|
|
646f31 |
--
|
|
|
646f31 |
1.8.3.1
|
|
|
646f31 |
|