Blame SOURCES/025-clear-attrs.patch
|
 |
ed4e54 |
From 01b463bd715d48dde5bf76ca3a2e78e31f0ffaa1 Mon Sep 17 00:00:00 2001
|
|
|
ed4e54 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
ed4e54 |
Date: Tue, 21 Jan 2020 17:25:57 -0600
|
|
|
ed4e54 |
Subject: [PATCH] Fix: controller: clear leaving node's transient attributes
|
|
|
ed4e54 |
even if there is no DC
|
|
|
ed4e54 |
|
|
|
ed4e54 |
---
|
|
|
ed4e54 |
daemons/controld/controld_callbacks.c | 8 ++++++--
|
|
|
ed4e54 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
ed4e54 |
|
|
|
ed4e54 |
diff --git a/daemons/controld/controld_callbacks.c b/daemons/controld/controld_callbacks.c
|
|
|
ed4e54 |
index f7e3db2..21f831a 100644
|
|
|
ed4e54 |
--- a/daemons/controld/controld_callbacks.c
|
|
|
ed4e54 |
+++ b/daemons/controld/controld_callbacks.c
|
|
|
ed4e54 |
@@ -1,5 +1,5 @@
|
|
|
ed4e54 |
/*
|
|
|
ed4e54 |
- * Copyright 2004-2019 the Pacemaker project contributors
|
|
|
ed4e54 |
+ * Copyright 2004-2020 the Pacemaker project contributors
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
* The version control history for this file may have further details.
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
@@ -205,7 +205,11 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
|
|
|
ed4e54 |
cib_scope_local);
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
|
|
|
ed4e54 |
- } else if(AM_I_DC) {
|
|
|
ed4e54 |
+ } else if (AM_I_DC || (fsa_our_dc == NULL)) {
|
|
|
ed4e54 |
+ /* This only needs to be done once, so normally the DC should do
|
|
|
ed4e54 |
+ * it. However if there is no DC, every node must do it, since
|
|
|
ed4e54 |
+ * there is no other way to ensure some one node does it.
|
|
|
ed4e54 |
+ */
|
|
|
ed4e54 |
if (appeared) {
|
|
|
ed4e54 |
te_trigger_stonith_history_sync(FALSE);
|
|
|
ed4e54 |
} else {
|
|
|
ed4e54 |
--
|
|
|
ed4e54 |
1.8.3.1
|
|
|
ed4e54 |
|