|
 |
f0d7ba |
From ad6414e38d1eb74fff3f5b59322d518fb13adb57 Mon Sep 17 00:00:00 2001
|
|
|
f0d7ba |
From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
|
|
|
f0d7ba |
Date: Tue, 28 Apr 2020 08:15:19 +0900
|
|
|
f0d7ba |
Subject: [PATCH] High : cotrold: Notify tengine of completion of
|
|
|
f0d7ba |
CRM_OP_LRM_DELETE.(Fix:CLBZ:#5424)
|
|
|
f0d7ba |
|
|
|
f0d7ba |
---
|
|
|
f0d7ba |
crmd/messages.c | 13 ++++++++++---
|
|
|
f0d7ba |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
f0d7ba |
|
|
|
f0d7ba |
diff --git a/crmd/messages.c b/crmd/messages.c
|
|
|
f0d7ba |
index 62719ad..0b063bc 100644
|
|
|
f0d7ba |
--- a/crmd/messages.c
|
|
|
f0d7ba |
+++ b/crmd/messages.c
|
|
|
f0d7ba |
@@ -685,13 +685,20 @@ handle_lrm_delete(xmlNode *stored_msg)
|
|
|
f0d7ba |
crmd_cib_smart_opt());
|
|
|
f0d7ba |
}
|
|
|
f0d7ba |
|
|
|
f0d7ba |
- // Notify client if not from graph (compare with notify_deleted())
|
|
|
f0d7ba |
- if (from_sys && strcmp(from_sys, CRM_SYSTEM_TENGINE)) {
|
|
|
f0d7ba |
+ //Notify client and tengine.(Only notify tengine if mode = "cib" and CRM_OP_LRM_DELETE.)
|
|
|
f0d7ba |
+ if (from_sys) {
|
|
|
f0d7ba |
lrmd_event_data_t *op = NULL;
|
|
|
f0d7ba |
const char *from_host = crm_element_value(stored_msg,
|
|
|
f0d7ba |
F_CRM_HOST_FROM);
|
|
|
f0d7ba |
- const char *transition = crm_element_value(msg_data,
|
|
|
f0d7ba |
+ const char *transition;
|
|
|
f0d7ba |
+
|
|
|
f0d7ba |
+ if (strcmp(from_sys, CRM_SYSTEM_TENGINE)) {
|
|
|
f0d7ba |
+ transition = crm_element_value(msg_data,
|
|
|
f0d7ba |
+ XML_ATTR_TRANSITION_KEY);
|
|
|
f0d7ba |
+ } else {
|
|
|
f0d7ba |
+ transition = crm_element_value(stored_msg,
|
|
|
f0d7ba |
XML_ATTR_TRANSITION_KEY);
|
|
|
f0d7ba |
+ }
|
|
|
f0d7ba |
|
|
|
f0d7ba |
crm_info("Notifying %s on %s that %s was%s deleted",
|
|
|
f0d7ba |
from_sys, (from_host? from_host : "local node"), rsc_id,
|
|
|
f0d7ba |
--
|
|
|
f0d7ba |
1.8.3.1
|
|
|
f0d7ba |
|