File bug-1042374_pacemaker-stonith-ng-trigger-on-con... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File bug-1042374_pacemaker-stonith-ng-trigger-on-constraints-added.patch of Package pacemaker (Revision 0e051afa0cc7159c73d2a3fcc79577e4)

Currently displaying revision 0e051afa0cc7159c73d2a3fcc79577e4 , Show latest

commit 8f3213cfceb548bec37b2e0668c670fe552934b5
Author: Klaus Wenninger <klaus.wenninger@aon.at>
Date:   Fri May 19 11:13:19 2017 +0200

Fix: stonith-ng: Trigger on constraints added to cib
    
    The simple search for 'rsc_location' just triggered on delete.
    'constraints' is found both in additions and deletes.
    A smarter check might reduce the number of unneeded triggers but
    probably isn't worth the effort.
    Add some trace-logging to facilitate tracking down similar issues.

diff --git a/fencing/commands.c b/fencing/commands.c
index deec050f5..5c00e3a12 100644
--- a/fencing/commands.c
+++ b/fencing/commands.c
@@ -1179,6 +1179,10 @@ stonith_device_remove(const char *id, gboolean from_cib)
         g_hash_table_remove(device_list, id);
         crm_info("Removed '%s' from the device list (%d active devices)",
                  id, g_hash_table_size(device_list));
+    } else {
+        crm_trace("Not removing '%s' from the device list (%d active devices) "
+                  "- still %s%s_registered", id, g_hash_table_size(device_list),
+                  device->cib_registered?"cib":"", device->api_registered?"api":"");
     }
     return pcmk_ok;
 }
diff --git a/fencing/main.c b/fencing/main.c
index 1c61d8bd0..b629d009a 100644
--- a/fencing/main.c
+++ b/fencing/main.c
@@ -787,7 +787,7 @@ update_cib_stonith_devices_v2(const char *event, xmlNode * msg)
             needs_update = TRUE;
             break;
 
-        } else if(strstr(xpath, XML_CONS_TAG_RSC_LOCATION)) {
+        } else if(strstr(xpath, XML_CIB_TAG_CONSTRAINTS)) {
             shortpath = strrchr(xpath, '/'); CRM_ASSERT(shortpath);
             reason = crm_strdup_printf("%s %s", op, shortpath+1);
             needs_update = TRUE;
@@ -798,6 +798,8 @@ update_cib_stonith_devices_v2(const char *event, xmlNode * msg)
     if(needs_update) {
         crm_info("Updating device list from the cib: %s", reason);
         cib_devices_update();
+    } else {
+        crm_trace("No updates for device list found in cib");
     }
     free(reason);
 }

Places

File bug-1042374_pacemaker-stonith-ng-trigger-on-constraints-added.patch of Package pacemaker (Revision 0e051afa0cc7159c73d2a3fcc79577e4)

Places