File pacemaker-pengine-message-stonith-disabled.patch of Package pacemaker.2980

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-pengine-message-stonith-disabled.patch of Package pacemaker.2980

commit e8b73be7e3775f48da71e3c3239c6f0a4cec8277
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Fri Jun 3 11:24:58 2016 -0500

Fix: libpengine: log message when stonith disabled, not enabled
    
    Sense of test was wrong. Only affected legacy configurations
    using "requires" with start action.

diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index d7421d1..7941440 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -698,7 +698,7 @@ unpack_operation(action_t * action, xmlNode * xml_obj, resource_t * container,
         }
     }
 
-    /* Begin compatability code */
+    /* Begin compatibility code ("requires" set on start action not resource) */
     value = g_hash_table_lookup(action->meta, "requires");
 
     if (safe_str_neq(action->task, RSC_START)
@@ -715,8 +715,8 @@ unpack_operation(action_t * action, xmlNode * xml_obj, resource_t * container,
     } else if (safe_str_eq(value, "unfencing")) {
         action->needs = rsc_req_stonith;
         set_bit(action->rsc->flags, pe_rsc_needs_unfencing);
-        if (is_set(data_set->flags, pe_flag_stonith_enabled)) {
-            crm_notice("%s requires (un)fencing but fencing is disabled", action->rsc->id);
+        if (is_not_set(data_set->flags, pe_flag_stonith_enabled)) {
+            crm_notice("%s requires unfencing but fencing is disabled", action->rsc->id);
         }
 
     } else if (is_set(data_set->flags, pe_flag_stonith_enabled)
@@ -725,7 +725,7 @@ unpack_operation(action_t * action, xmlNode * xml_obj, resource_t * container,
         if (is_not_set(data_set->flags, pe_flag_stonith_enabled)) {
             crm_notice("%s requires fencing but fencing is disabled", action->rsc->id);
         }
-        /* End compatability code */
+        /* End compatibility code */
 
     } else if (is_set(action->rsc->flags, pe_rsc_needs_fencing)) {
         action->needs = rsc_req_stonith;

Places

File pacemaker-pengine-message-stonith-disabled.patch of Package pacemaker.2980

Places