File pacemaker-pengine-not-re-add-node-default-score... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-pengine-not-re-add-node-default-score-for-each-location-constraint.patch of Package pacemaker (Revision 75d7df0b6dbe520036bc2431301d7aa9)

Currently displaying revision 75d7df0b6dbe520036bc2431301d7aa9 , Show latest

commit 499d2d4d300b45984e2165e75a9bbdb33f8e752d
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Wed Jun 14 12:24:12 2017 +1000

Fix: PE: Do not re-add a node's default score for each location constraint

diff --git a/pengine/test10/base-score.scores b/pengine/test10/base-score.scores
index 1c47a9bd1..795524197 100644
--- a/pengine/test10/base-score.scores
+++ b/pengine/test10/base-score.scores
@@ -1,5 +1,5 @@
 Allocation scores:
-native_color: Dummy allocation score on puma1: 210
+native_color: Dummy allocation score on puma1: 110
 native_color: Dummy allocation score on puma2: 0
 native_color: Dummy allocation score on puma3: -2000
 native_color: Dummy allocation score on puma4: 0
diff --git a/pengine/utils.c b/pengine/utils.c
index 755f1c8cf..a587e587d 100644
--- a/pengine/utils.c
+++ b/pengine/utils.c
@@ -96,7 +96,7 @@ rsc2node_new(const char *id, resource_t * rsc,
         if (foo_node != NULL) {
             node_t *copy = node_copy(foo_node);
 
-            copy->weight = merge_weights(node_weight, foo_node->weight);
+            copy->weight = node_weight;
             new_con->node_list_rh = g_list_prepend(NULL, copy);
         }

Places

File pacemaker-pengine-not-re-add-node-default-score-for-each-location-constraint.patch of Package pacemaker (Revision 75d7df0b6dbe520036bc2431301d7aa9)

Places