File bug-971129_pacemaker-pengine-clone-update-actio... of Package pacemaker.2980

Overview Repositories Revisions Requests Users Attributes Meta

File bug-971129_pacemaker-pengine-clone-update-actions-condition.patch of Package pacemaker.2980

commit ddd38b64a5b037e3167e6944c9f9a9486e3fad5b
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Fri Jan 29 16:49:06 2016 +1100

Log: PE: Fix conditions for internal sanity check

diff --git a/pengine/clone.c b/pengine/clone.c
index 66810eb..59ec5f2 100644
--- a/pengine/clone.c
+++ b/pengine/clone.c
@@ -1280,9 +1280,10 @@ clone_update_actions_interleave(action_t * first, action_t * then, node_t * node
             CRM_CHECK(first_action != NULL || is_set(first_child->flags, pe_rsc_orphan),
                       crm_err("No action found for %s in %s (first)", first_task, first_child->id));
 
+            /* We're only interested if 'then' is neither stopping nor being demoted */ 
             if (then_action == NULL && is_not_set(then_child->flags, pe_rsc_orphan)
-                && crm_str_eq(then->task, RSC_STOP, TRUE) == FALSE
-                && crm_str_eq(then->task, RSC_DEMOTED, TRUE) == FALSE) {
+                && crm_str_eq(then->task, RSC_STOP, TRUE) == FALSE 
+                && crm_str_eq(then->task, RSC_DEMOTE, TRUE) == FALSE) {
                 crm_err("Internal error: No action found for %s in %s (then)", then->task,
                         then_child->id);
             }

Places

File bug-971129_pacemaker-pengine-clone-update-actions-condition.patch of Package pacemaker.2980

Places