File pacemaker-rhbz#1519812-Prevent-notify-actions-f... of Package pacemaker.13547

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-rhbz#1519812-Prevent-notify-actions-from-causing---wait-to-hang.patch of Package pacemaker.13547

commit 2ce5fc46463ff7b9a5a2c68602d8c5b35a7c37d7
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Tue Jan 16 19:05:31 2018 +1100

Bug rhbz#1519812 - Prevent notify actions from causing --wait to hang

diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
index 22bdebf8e..189d1b3e0 100644
--- a/tools/crm_resource_runtime.c
+++ b/tools/crm_resource_runtime.c
@@ -1343,10 +1343,19 @@ done:
     return rc;
 }
 
-#define action_is_pending(action) \
-    ((is_set((action)->flags, pe_action_optional) == FALSE) \
-    && (is_set((action)->flags, pe_action_runnable) == TRUE) \
-    && (is_set((action)->flags, pe_action_pseudo) == FALSE))
+static inline int action_is_pending(action_t *action) 
+{
+    if(is_set(action->flags, pe_action_optional)) {
+        return FALSE;
+    } else if(is_set(action->flags, pe_action_runnable) == FALSE) {
+        return FALSE;
+    } else if(is_set(action->flags, pe_action_pseudo)) {
+        return FALSE;
+    } else if(safe_str_eq("notify", action->task)) {
+        return FALSE;
+    }
+    return TRUE;
+}
 
 /*!
  * \internal
@@ -1362,7 +1371,9 @@ actions_are_pending(GListPtr actions)
     GListPtr action;
 
     for (action = actions; action != NULL; action = action->next) {
-        if (action_is_pending((action_t *) action->data)) {
+        action_t *a = (action_t *)action->data;
+        if (action_is_pending(a)) {
+            crm_notice("Waiting for %s (flags=0x%.8x)", a->uuid, a->flags);
             return TRUE;
         }
     }

Places

File pacemaker-rhbz#1519812-Prevent-notify-actions-from-causing---wait-to-hang.patch of Package pacemaker.13547

Places