File pacemaker-pengine-tools-avoid-unnecessary-use-o... of Package pacemaker.8397

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-pengine-tools-avoid-unnecessary-use-of-pe_find_current.patch of Package pacemaker.8397

commit 656f6d56a88f56c76fb58c1ef57ac033cece7d6b
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Mon Nov 6 12:29:59 2017 -0600

Refactor: pengine,tools,libpe_status: avoid unnecessary use of pe_find_current
    
    It only has any effect when a node is given.

Index: pacemaker-1.1.16+20170320.77ea74d/lib/pengine/status.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/lib/pengine/status.c
+++ pacemaker-1.1.16+20170320.77ea74d/lib/pengine/status.c
@@ -251,7 +251,7 @@ set_working_set_defaults(pe_working_set_
 resource_t *
 pe_find_resource(GListPtr rsc_list, const char *id)
 {
-    return pe_find_resource_with_flags(rsc_list, id, pe_find_renamed | pe_find_current);
+    return pe_find_resource_with_flags(rsc_list, id, pe_find_renamed);
 }
 
 resource_t *
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/constraints.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/constraints.c
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/constraints.c
@@ -181,9 +181,8 @@ pe_find_constraint_resource(GListPtr rsc
 
     for (rIter = rsc_list; id && rIter; rIter = rIter->next) {
         resource_t *parent = rIter->data;
-
-        resource_t *match =
-            parent->fns->find_rsc(parent, id, NULL, pe_find_renamed | pe_find_current);
+        resource_t *match = parent->fns->find_rsc(parent, id, NULL,
+                                                  pe_find_renamed);
 
         if (match != NULL) {
             if(safe_str_neq(match->id, id)) {
Index: pacemaker-1.1.16+20170320.77ea74d/tools/crm_resource.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/tools/crm_resource.c
+++ pacemaker-1.1.16+20170320.77ea74d/tools/crm_resource.c
@@ -834,8 +834,8 @@ main(int argc, char **argv)
             goto bail;
         }
 
-        rsc = pe_find_resource_with_flags(data_set.resources, rsc_id, pe_find_renamed | pe_find_current | pe_find_anon);
-
+        rsc = pe_find_resource_with_flags(data_set.resources, rsc_id,
+                                          pe_find_renamed | pe_find_anon);
         rc = -EINVAL;
         if (rsc == NULL) {
             CMD_ERR("Resource '%s' not restarted: unknown", rsc_id);
@@ -856,7 +856,8 @@ main(int argc, char **argv)
 
     } else if (rsc_cmd == 'A' || rsc_cmd == 'a') {
         GListPtr lpc = NULL;
-        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id, pe_find_renamed | pe_find_current | pe_find_anon);
+        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id,
+                                                      pe_find_renamed | pe_find_anon);
         xmlNode *cib_constraints = get_object_root(XML_CIB_TAG_CONSTRAINTS, data_set.input);
 
         if (rsc == NULL) {
@@ -968,7 +969,8 @@ main(int argc, char **argv)
         rc = cli_resource_move(rsc_id, host_uname, cib_conn, &data_set);
 
     } else if (rsc_cmd == 'B' && host_uname) {
-        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id, pe_find_renamed | pe_find_current | pe_find_anon);
+        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id,
+                                                      pe_find_renamed | pe_find_anon);
         node_t *dest = pe_find_node(data_set.nodes, host_uname);
 
         rc = -ENXIO;
@@ -985,7 +987,8 @@ main(int argc, char **argv)
         rc = cli_resource_ban(rsc_id, dest->details->uname, NULL, cib_conn);
 
     } else if (rsc_cmd == 'B' || rsc_cmd == 'M') {
-        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id, pe_find_renamed | pe_find_current | pe_find_anon);
+        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id,
+                                                      pe_find_renamed | pe_find_anon);
 
         rc = -ENXIO;
         if (rsc_id == NULL) {
@@ -1106,7 +1109,8 @@ main(int argc, char **argv)
         rc = cli_resource_delete_attribute(rsc_id, prop_set, prop_id, prop_name, cib_conn, &data_set);
 
     } else if (rsc_cmd == 'C' && rsc_id) {
-        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id, pe_find_renamed | pe_find_current | pe_find_anon);
+        resource_t *rsc = pe_find_resource_with_flags(data_set.resources, rsc_id,
+                                                      pe_find_renamed | pe_find_anon);
 
         if(do_force == FALSE) {
             rsc = uber_parent(rsc);

Places

File pacemaker-pengine-tools-avoid-unnecessary-use-of-pe_find_current.patch of Package pacemaker.8397

Places