Low: fencer: Don't remove device if child is deleted

If the child of a primitive element representing a fencing device was
deleted, and we didn't catch it earlier as instance_attributes or
meta_attributes, then previously we would remove the fencing device. We
should remove the device only if the primitive itself was deleted.

By inspection, it looks like this would unregister a fencing device if
one of its operations (op elements) were deleted.

If we find that only a child of the primitive was deleted, fall through
to the next if block -- that is, "continue" only if the primitive itself
was deleted and we call stonith_device_remove().

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

daemons/fenced/fenced_cib.c

@@ -258,7 +258,6 @@ update_cib_stonith_devices(const xmlNode *patchset)
 
             const char *rsc_id = NULL;
             const char *end_quote = NULL;
-            char *copy = NULL;
 
             if ((strstr(primitive_xpath, PCMK_XE_INSTANCE_ATTRIBUTES) != NULL)
                 || (strstr(primitive_xpath, PCMK_XE_META_ATTRIBUTES) != NULL)) {
@@ -277,19 +276,22 @@ update_cib_stonith_devices(const xmlNode *patchset)
                 continue;
             }
 
-            /* A primitive resource was removed. If it was a fencing resource,
-             * it's faster to remove it directly than to run the scheduler and
-             * update all device registrations.
-             */
-            copy = strndup(rsc_id, end_quote - rsc_id);
-            pcmk__assert(copy != NULL);
-            stonith_device_remove(copy, true);
+            if (strchr(end_quote, '/') == NULL) {
+                /* The primitive element itself was deleted. If this was a
+                 * fencing resource, it's faster to remove it directly than to
+                 * run the scheduler and update all device registrations.
+                */
+                char *copy = strndup(rsc_id, end_quote - rsc_id);
 
-            /* watchdog_device_update called afterwards
-               to fall back to implicit definition if needed */
+                pcmk__assert(copy != NULL);
+                stonith_device_remove(copy, true);
 
-            free(copy);
-            continue;
+                /* watchdog_device_update called afterwards
+                   to fall back to implicit definition if needed */
+
+                free(copy);
+                continue;
+            }
         }
 
         if (strstr(xpath, "/" PCMK_XE_RESOURCES)