diff --git a/pengine/test10/bug-1765.scores b/pengine/test10/bug-1765.scores
index 28f19e1910..432e69662c 100644
--- a/pengine/test10/bug-1765.scores
+++ b/pengine/test10/bug-1765.scores
@@ -1,27 +1,27 @@
Allocation scores:
clone_color: drbd0:0 allocation score on sles236: 76
clone_color: drbd0:0 allocation score on sles238: 75
-clone_color: drbd0:1 allocation score on sles236: 0
+clone_color: drbd0:1 allocation score on sles236: 10
clone_color: drbd0:1 allocation score on sles238: 5
clone_color: drbd1:0 allocation score on sles236: 0
clone_color: drbd1:0 allocation score on sles238: 76
clone_color: drbd1:1 allocation score on sles236: 76
clone_color: drbd1:1 allocation score on sles238: 0
clone_color: ms-drbd0 allocation score on sles236: 0
clone_color: ms-drbd0 allocation score on sles238: 0
clone_color: ms-drbd1 allocation score on sles236: 0
clone_color: ms-drbd1 allocation score on sles238: 0
drbd0:0 promotion score on sles236: INFINITY
drbd0:1 promotion score on sles238: -INFINITY
drbd0:2 promotion score on none: 0
drbd1:0 promotion score on sles238: 75
drbd1:1 promotion score on sles236: 75
drbd1:2 promotion score on none: 0
native_color: drbd0:0 allocation score on sles236: 76
native_color: drbd0:0 allocation score on sles238: 75
native_color: drbd0:1 allocation score on sles236: -INFINITY
native_color: drbd0:1 allocation score on sles238: 5
native_color: drbd1:0 allocation score on sles236: 0
native_color: drbd1:0 allocation score on sles238: 76
native_color: drbd1:1 allocation score on sles236: 76
native_color: drbd1:1 allocation score on sles238: -INFINITY
diff --git a/pengine/test10/inc11.scores b/pengine/test10/inc11.scores
index aee2f26fd0..722fa9104f 100644
--- a/pengine/test10/inc11.scores
+++ b/pengine/test10/inc11.scores
@@ -1,21 +1,21 @@
Allocation scores:
-child_rsc1:0 promotion score on node1: -1
-child_rsc1:1 promotion score on node2: 99
+child_rsc1:0 promotion score on node1: 10
+child_rsc1:1 promotion score on node2: 400
clone_color: child_rsc1:0 allocation score on node0: -INFINITY
-clone_color: child_rsc1:0 allocation score on node1: 0
-clone_color: child_rsc1:0 allocation score on node2: 0
+clone_color: child_rsc1:0 allocation score on node1: 10
+clone_color: child_rsc1:0 allocation score on node2: 30
clone_color: child_rsc1:1 allocation score on node0: -INFINITY
-clone_color: child_rsc1:1 allocation score on node1: 0
-clone_color: child_rsc1:1 allocation score on node2: 0
+clone_color: child_rsc1:1 allocation score on node1: 100
+clone_color: child_rsc1:1 allocation score on node2: 300
clone_color: rsc1 allocation score on node0: -INFINITY
clone_color: rsc1 allocation score on node1: 0
clone_color: rsc1 allocation score on node2: 0
native_color: child_rsc1:0 allocation score on node0: -INFINITY
-native_color: child_rsc1:0 allocation score on node1: 0
-native_color: child_rsc1:0 allocation score on node2: 0
+native_color: child_rsc1:0 allocation score on node1: 10
+native_color: child_rsc1:0 allocation score on node2: -INFINITY
native_color: child_rsc1:1 allocation score on node0: -INFINITY
-native_color: child_rsc1:1 allocation score on node1: -INFINITY
-native_color: child_rsc1:1 allocation score on node2: 0
+native_color: child_rsc1:1 allocation score on node1: 100
+native_color: child_rsc1:1 allocation score on node2: 300
native_color: simple-rsc allocation score on node0: -INFINITY
native_color: simple-rsc allocation score on node1: -INFINITY
-native_color: simple-rsc allocation score on node2: 0
+native_color: simple-rsc allocation score on node2: 300
diff --git a/pengine/test10/master-10.dot b/pengine/test10/master-10.dot
index 20ad6b6d12..0c1df26461 100644
--- a/pengine/test10/master-10.dot
+++ b/pengine/test10/master-10.dot
@@ -1,116 +1,121 @@
digraph "g" {
"child_rsc1:0_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_monitor_11000 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:0_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:0_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_promote_0 node1" -> "child_rsc1:0_monitor_11000 node1" [ style = bold]
"child_rsc1:0_promote_0 node1" -> "rsc1_promoted_0" [ style = bold]
"child_rsc1:0_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_start_0 node1" -> "child_rsc1:0_monitor_11000 node1" [ style = bold]
"child_rsc1:0_start_0 node1" -> "child_rsc1:0_promote_0 node1" [ style = bold]
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold]
"child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_monitor_1000 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:1_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:1_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:1_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_start_0 node2" -> "child_rsc1:1_monitor_1000 node2" [ style = bold]
"child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_monitor_1000 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:2_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:2_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:2_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_start_0 node1" -> "child_rsc1:2_monitor_1000 node1" [ style = bold]
"child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = bold]
"child_rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:3_monitor_1000 node2" [ style=bold color="green" fontcolor="black" ]
+"child_rsc1:3_monitor_11000 node2" [ style=bold color="green" fontcolor="black"]
"child_rsc1:3_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:3_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:3_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:3_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:3_start_0 node2" -> "child_rsc1:3_monitor_1000 node2" [ style = bold]
+"child_rsc1:3_promote_0 node2" -> "child_rsc1:3_monitor_11000 node2" [ style = bold]
+"child_rsc1:3_promote_0 node2" -> "rsc1_promoted_0" [ style = bold]
+"child_rsc1:3_promote_0 node2" [ style=bold color="green" fontcolor="black"]
+"child_rsc1:3_start_0 node2" -> "child_rsc1:3_monitor_11000 node2" [ style = bold]
+"child_rsc1:3_start_0 node2" -> "child_rsc1:3_promote_0 node2" [ style = bold]
"child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:4_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_confirmed-post_notify_promoted_0" -> "child_rsc1:0_monitor_11000 node1" [ style = bold]
"rsc1_confirmed-post_notify_promoted_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold]
"rsc1_confirmed-post_notify_promoted_0" -> "child_rsc1:2_monitor_1000 node1" [ style = bold]
-"rsc1_confirmed-post_notify_promoted_0" -> "child_rsc1:3_monitor_1000 node2" [ style = bold]
+"rsc1_confirmed-post_notify_promoted_0" -> "child_rsc1:3_monitor_11000 node2" [ style = bold]
"rsc1_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_confirmed-post_notify_running_0" -> "child_rsc1:0_monitor_11000 node1" [ style = bold]
"rsc1_confirmed-post_notify_running_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold]
"rsc1_confirmed-post_notify_running_0" -> "child_rsc1:2_monitor_1000 node1" [ style = bold]
-"rsc1_confirmed-post_notify_running_0" -> "child_rsc1:3_monitor_1000 node2" [ style = bold]
+"rsc1_confirmed-post_notify_running_0" -> "child_rsc1:3_monitor_11000 node2" [ style = bold]
"rsc1_confirmed-post_notify_running_0" -> "rsc1_pre_notify_promote_0" [ style = bold]
"rsc1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_confirmed-pre_notify_promote_0" -> "rsc1_post_notify_promoted_0" [ style = bold]
"rsc1_confirmed-pre_notify_promote_0" -> "rsc1_promote_0" [ style = bold]
"rsc1_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_confirmed-pre_notify_start_0" -> "rsc1_post_notify_running_0" [ style = bold]
"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
"rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_post_notify_promoted_0" -> "child_rsc1:0_post_notify_promote_0 node1" [ style = bold]
"rsc1_post_notify_promoted_0" -> "child_rsc1:1_post_notify_promote_0 node2" [ style = bold]
"rsc1_post_notify_promoted_0" -> "child_rsc1:2_post_notify_promote_0 node1" [ style = bold]
"rsc1_post_notify_promoted_0" -> "child_rsc1:3_post_notify_promote_0 node2" [ style = bold]
"rsc1_post_notify_promoted_0" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"rsc1_post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_post_notify_running_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold]
"rsc1_post_notify_running_0" -> "child_rsc1:1_post_notify_start_0 node2" [ style = bold]
"rsc1_post_notify_running_0" -> "child_rsc1:2_post_notify_start_0 node1" [ style = bold]
"rsc1_post_notify_running_0" -> "child_rsc1:3_post_notify_start_0 node2" [ style = bold]
"rsc1_post_notify_running_0" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"rsc1_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_pre_notify_promote_0" -> "child_rsc1:0_pre_notify_promote_0 node1" [ style = bold]
"rsc1_pre_notify_promote_0" -> "child_rsc1:1_pre_notify_promote_0 node2" [ style = bold]
"rsc1_pre_notify_promote_0" -> "child_rsc1:2_pre_notify_promote_0 node1" [ style = bold]
"rsc1_pre_notify_promote_0" -> "child_rsc1:3_pre_notify_promote_0 node2" [ style = bold]
"rsc1_pre_notify_promote_0" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"rsc1_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
"rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_promote_0" -> "child_rsc1:0_promote_0 node1" [ style = bold]
+"rsc1_promote_0" -> "child_rsc1:3_promote_0 node2" [ style = bold]
"rsc1_promote_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_promoted_0" -> "rsc1_post_notify_promoted_0" [ style = bold]
"rsc1_promoted_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_running_0" -> "rsc1_post_notify_running_0" [ style = bold]
"rsc1_running_0" -> "rsc1_promote_0" [ style = bold]
"rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = bold]
"rsc1_start_0" -> "child_rsc1:1_start_0 node2" [ style = bold]
"rsc1_start_0" -> "child_rsc1:2_start_0 node1" [ style = bold]
"rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
}
diff --git a/pengine/test10/master-10.exp b/pengine/test10/master-10.exp
index 40271701f0..320391cbfe 100644
--- a/pengine/test10/master-10.exp
+++ b/pengine/test10/master-10.exp
@@ -1,623 +1,645 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/master-10.scores b/pengine/test10/master-10.scores
index 382cdbca08..f79b79d586 100644
--- a/pengine/test10/master-10.scores
+++ b/pengine/test10/master-10.scores
@@ -1,28 +1,28 @@
Allocation scores:
-child_rsc1:0 promotion score on node1: 198
-child_rsc1:1 promotion score on node2: -1
-child_rsc1:2 promotion score on node1: 198
-child_rsc1:3 promotion score on node2: -1
+child_rsc1:0 promotion score on node1: 230
+child_rsc1:1 promotion score on node2: 30
+child_rsc1:2 promotion score on node1: 230
+child_rsc1:3 promotion score on node2: 30
child_rsc1:4 promotion score on none: 0
-clone_color: child_rsc1:0 allocation score on node1: 0
+clone_color: child_rsc1:0 allocation score on node1: 20
clone_color: child_rsc1:0 allocation score on node2: 0
clone_color: child_rsc1:1 allocation score on node1: 0
-clone_color: child_rsc1:1 allocation score on node2: 0
-clone_color: child_rsc1:2 allocation score on node1: 0
+clone_color: child_rsc1:1 allocation score on node2: 10
+clone_color: child_rsc1:2 allocation score on node1: 10
clone_color: child_rsc1:2 allocation score on node2: 0
clone_color: child_rsc1:3 allocation score on node1: 0
-clone_color: child_rsc1:3 allocation score on node2: 0
+clone_color: child_rsc1:3 allocation score on node2: 20
clone_color: child_rsc1:4 allocation score on node1: 0
clone_color: child_rsc1:4 allocation score on node2: 0
clone_color: rsc1 allocation score on node1: 0
clone_color: rsc1 allocation score on node2: 0
-native_color: child_rsc1:0 allocation score on node1: 0
+native_color: child_rsc1:0 allocation score on node1: 20
native_color: child_rsc1:0 allocation score on node2: 0
native_color: child_rsc1:1 allocation score on node1: 0
-native_color: child_rsc1:1 allocation score on node2: 0
-native_color: child_rsc1:2 allocation score on node1: 0
-native_color: child_rsc1:2 allocation score on node2: 0
-native_color: child_rsc1:3 allocation score on node1: -INFINITY
-native_color: child_rsc1:3 allocation score on node2: 0
+native_color: child_rsc1:1 allocation score on node2: 10
+native_color: child_rsc1:2 allocation score on node1: 10
+native_color: child_rsc1:2 allocation score on node2: -INFINITY
+native_color: child_rsc1:3 allocation score on node1: 0
+native_color: child_rsc1:3 allocation score on node2: 20
native_color: child_rsc1:4 allocation score on node1: -INFINITY
native_color: child_rsc1:4 allocation score on node2: -INFINITY
diff --git a/pengine/test10/master-10.summary b/pengine/test10/master-10.summary
index d736f7c97d..c73fbda6a0 100644
--- a/pengine/test10/master-10.summary
+++ b/pengine/test10/master-10.summary
@@ -1,72 +1,73 @@
Current cluster status:
Online: [ node1 node2 ]
Master/Slave Set: rsc1 [child_rsc1] (unique)
child_rsc1:0 (ocf::heartbeat:apache): Stopped
child_rsc1:1 (ocf::heartbeat:apache): Stopped
child_rsc1:2 (ocf::heartbeat:apache): Stopped
child_rsc1:3 (ocf::heartbeat:apache): Stopped
child_rsc1:4 (ocf::heartbeat:apache): Stopped
Transition Summary:
* Promote child_rsc1:0 (Stopped -> Master node1)
* Start child_rsc1:1 (node2)
* Start child_rsc1:2 (node1)
- * Start child_rsc1:3 (node2)
+ * Promote child_rsc1:3 ( Stopped -> Master node2 )
Executing cluster transition:
* Resource action: child_rsc1:0 monitor on node2
* Resource action: child_rsc1:0 monitor on node1
* Resource action: child_rsc1:1 monitor on node2
* Resource action: child_rsc1:1 monitor on node1
* Resource action: child_rsc1:2 monitor on node2
* Resource action: child_rsc1:2 monitor on node1
* Resource action: child_rsc1:3 monitor on node2
* Resource action: child_rsc1:3 monitor on node1
* Resource action: child_rsc1:4 monitor on node2
* Resource action: child_rsc1:4 monitor on node1
* Pseudo action: rsc1_pre_notify_start_0
* Pseudo action: rsc1_confirmed-pre_notify_start_0
* Pseudo action: rsc1_start_0
* Resource action: child_rsc1:0 start on node1
* Resource action: child_rsc1:1 start on node2
* Resource action: child_rsc1:2 start on node1
* Resource action: child_rsc1:3 start on node2
* Pseudo action: rsc1_running_0
* Pseudo action: rsc1_post_notify_running_0
* Resource action: child_rsc1:0 notify on node1
* Resource action: child_rsc1:1 notify on node2
* Resource action: child_rsc1:2 notify on node1
* Resource action: child_rsc1:3 notify on node2
* Pseudo action: rsc1_confirmed-post_notify_running_0
* Pseudo action: rsc1_pre_notify_promote_0
* Resource action: child_rsc1:0 notify on node1
* Resource action: child_rsc1:1 notify on node2
* Resource action: child_rsc1:2 notify on node1
* Resource action: child_rsc1:3 notify on node2
* Pseudo action: rsc1_confirmed-pre_notify_promote_0
* Pseudo action: rsc1_promote_0
* Resource action: child_rsc1:0 promote on node1
+ * Resource action: child_rsc1:3 promote on node2
* Pseudo action: rsc1_promoted_0
* Pseudo action: rsc1_post_notify_promoted_0
* Resource action: child_rsc1:0 notify on node1
* Resource action: child_rsc1:1 notify on node2
* Resource action: child_rsc1:2 notify on node1
* Resource action: child_rsc1:3 notify on node2
* Pseudo action: rsc1_confirmed-post_notify_promoted_0
* Resource action: child_rsc1:0 monitor=11000 on node1
* Resource action: child_rsc1:1 monitor=1000 on node2
* Resource action: child_rsc1:2 monitor=1000 on node1
- * Resource action: child_rsc1:3 monitor=1000 on node2
+ * Resource action: child_rsc1:3 monitor=11000 on node2
Revised cluster status:
Online: [ node1 node2 ]
Master/Slave Set: rsc1 [child_rsc1] (unique)
child_rsc1:0 (ocf::heartbeat:apache): Master node1
child_rsc1:1 (ocf::heartbeat:apache): Slave node2
child_rsc1:2 (ocf::heartbeat:apache): Slave node1
- child_rsc1:3 (ocf::heartbeat:apache): Slave node2
+ child_rsc1:3 (ocf::heartbeat:apache): Master node2
child_rsc1:4 (ocf::heartbeat:apache): Stopped
diff --git a/pengine/test10/master-11.scores b/pengine/test10/master-11.scores
index b49233082f..2eac291bb6 100644
--- a/pengine/test10/master-11.scores
+++ b/pengine/test10/master-11.scores
@@ -1,15 +1,15 @@
Allocation scores:
-child_rsc1:0 promotion score on node1: -1
-child_rsc1:1 promotion score on node2: 99
-clone_color: child_rsc1:0 allocation score on node1: 0
-clone_color: child_rsc1:0 allocation score on node2: 0
-clone_color: child_rsc1:1 allocation score on node1: 0
-clone_color: child_rsc1:1 allocation score on node2: 0
+child_rsc1:0 promotion score on node1: 10
+child_rsc1:1 promotion score on node2: 400
+clone_color: child_rsc1:0 allocation score on node1: 10
+clone_color: child_rsc1:0 allocation score on node2: 30
+clone_color: child_rsc1:1 allocation score on node1: 100
+clone_color: child_rsc1:1 allocation score on node2: 300
clone_color: rsc1 allocation score on node1: 0
clone_color: rsc1 allocation score on node2: 0
-native_color: child_rsc1:0 allocation score on node1: 0
-native_color: child_rsc1:0 allocation score on node2: 0
-native_color: child_rsc1:1 allocation score on node1: -INFINITY
-native_color: child_rsc1:1 allocation score on node2: 0
+native_color: child_rsc1:0 allocation score on node1: 10
+native_color: child_rsc1:0 allocation score on node2: -INFINITY
+native_color: child_rsc1:1 allocation score on node1: 100
+native_color: child_rsc1:1 allocation score on node2: 300
native_color: simple-rsc allocation score on node1: -INFINITY
-native_color: simple-rsc allocation score on node2: 0
+native_color: simple-rsc allocation score on node2: 300
diff --git a/pengine/test10/master-2.dot b/pengine/test10/master-2.dot
index 771317902e..25ab7dcc47 100644
--- a/pengine/test10/master-2.dot
+++ b/pengine/test10/master-2.dot
@@ -1,99 +1,103 @@
digraph "g" {
"child_rsc1:0_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:0_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:0_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_promote_0 node1" -> "rsc1_promoted_0" [ style = bold]
"child_rsc1:0_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:0_start_0 node1" -> "child_rsc1:0_promote_0 node1" [ style = bold]
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold]
"child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:1_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:1_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:1_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:2_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:2_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:2_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = bold]
"child_rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"child_rsc1:3_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"child_rsc1:3_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:3_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"child_rsc1:3_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ]
+"child_rsc1:3_promote_0 node2" -> "rsc1_promoted_0" [ style = bold]
+"child_rsc1:3_promote_0 node2" [ style=bold color="green" fontcolor="black"]
+"child_rsc1:3_start_0 node2" -> "child_rsc1:3_promote_0 node2" [ style = bold]
"child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:4_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
"child_rsc1:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
"child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_confirmed-post_notify_running_0" -> "rsc1_pre_notify_promote_0" [ style = bold]
"rsc1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_confirmed-pre_notify_promote_0" -> "rsc1_post_notify_promoted_0" [ style = bold]
"rsc1_confirmed-pre_notify_promote_0" -> "rsc1_promote_0" [ style = bold]
"rsc1_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_confirmed-pre_notify_start_0" -> "rsc1_post_notify_running_0" [ style = bold]
"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
"rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_post_notify_promoted_0" -> "child_rsc1:0_post_notify_promote_0 node1" [ style = bold]
"rsc1_post_notify_promoted_0" -> "child_rsc1:1_post_notify_promote_0 node2" [ style = bold]
"rsc1_post_notify_promoted_0" -> "child_rsc1:2_post_notify_promote_0 node1" [ style = bold]
"rsc1_post_notify_promoted_0" -> "child_rsc1:3_post_notify_promote_0 node2" [ style = bold]
"rsc1_post_notify_promoted_0" -> "rsc1_confirmed-post_notify_promoted_0" [ style = bold]
"rsc1_post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_post_notify_running_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold]
"rsc1_post_notify_running_0" -> "child_rsc1:1_post_notify_start_0 node2" [ style = bold]
"rsc1_post_notify_running_0" -> "child_rsc1:2_post_notify_start_0 node1" [ style = bold]
"rsc1_post_notify_running_0" -> "child_rsc1:3_post_notify_start_0 node2" [ style = bold]
"rsc1_post_notify_running_0" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
"rsc1_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_pre_notify_promote_0" -> "child_rsc1:0_pre_notify_promote_0 node1" [ style = bold]
"rsc1_pre_notify_promote_0" -> "child_rsc1:1_pre_notify_promote_0 node2" [ style = bold]
"rsc1_pre_notify_promote_0" -> "child_rsc1:2_pre_notify_promote_0 node1" [ style = bold]
"rsc1_pre_notify_promote_0" -> "child_rsc1:3_pre_notify_promote_0 node2" [ style = bold]
"rsc1_pre_notify_promote_0" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold]
"rsc1_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
"rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_promote_0" -> "child_rsc1:0_promote_0 node1" [ style = bold]
+"rsc1_promote_0" -> "child_rsc1:3_promote_0 node2" [ style = bold]
"rsc1_promote_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_promoted_0" -> "rsc1_post_notify_promoted_0" [ style = bold]
"rsc1_promoted_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_running_0" -> "rsc1_post_notify_running_0" [ style = bold]
"rsc1_running_0" -> "rsc1_promote_0" [ style = bold]
"rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = bold]
"rsc1_start_0" -> "child_rsc1:1_start_0 node2" [ style = bold]
"rsc1_start_0" -> "child_rsc1:2_start_0 node1" [ style = bold]
"rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
}
diff --git a/pengine/test10/master-2.exp b/pengine/test10/master-2.exp
index 410c1e464d..3174cf8230 100644
--- a/pengine/test10/master-2.exp
+++ b/pengine/test10/master-2.exp
@@ -1,544 +1,563 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/master-2.scores b/pengine/test10/master-2.scores
index 382cdbca08..f79b79d586 100644
--- a/pengine/test10/master-2.scores
+++ b/pengine/test10/master-2.scores
@@ -1,28 +1,28 @@
Allocation scores:
-child_rsc1:0 promotion score on node1: 198
-child_rsc1:1 promotion score on node2: -1
-child_rsc1:2 promotion score on node1: 198
-child_rsc1:3 promotion score on node2: -1
+child_rsc1:0 promotion score on node1: 230
+child_rsc1:1 promotion score on node2: 30
+child_rsc1:2 promotion score on node1: 230
+child_rsc1:3 promotion score on node2: 30
child_rsc1:4 promotion score on none: 0
-clone_color: child_rsc1:0 allocation score on node1: 0
+clone_color: child_rsc1:0 allocation score on node1: 20
clone_color: child_rsc1:0 allocation score on node2: 0
clone_color: child_rsc1:1 allocation score on node1: 0
-clone_color: child_rsc1:1 allocation score on node2: 0
-clone_color: child_rsc1:2 allocation score on node1: 0
+clone_color: child_rsc1:1 allocation score on node2: 10
+clone_color: child_rsc1:2 allocation score on node1: 10
clone_color: child_rsc1:2 allocation score on node2: 0
clone_color: child_rsc1:3 allocation score on node1: 0
-clone_color: child_rsc1:3 allocation score on node2: 0
+clone_color: child_rsc1:3 allocation score on node2: 20
clone_color: child_rsc1:4 allocation score on node1: 0
clone_color: child_rsc1:4 allocation score on node2: 0
clone_color: rsc1 allocation score on node1: 0
clone_color: rsc1 allocation score on node2: 0
-native_color: child_rsc1:0 allocation score on node1: 0
+native_color: child_rsc1:0 allocation score on node1: 20
native_color: child_rsc1:0 allocation score on node2: 0
native_color: child_rsc1:1 allocation score on node1: 0
-native_color: child_rsc1:1 allocation score on node2: 0
-native_color: child_rsc1:2 allocation score on node1: 0
-native_color: child_rsc1:2 allocation score on node2: 0
-native_color: child_rsc1:3 allocation score on node1: -INFINITY
-native_color: child_rsc1:3 allocation score on node2: 0
+native_color: child_rsc1:1 allocation score on node2: 10
+native_color: child_rsc1:2 allocation score on node1: 10
+native_color: child_rsc1:2 allocation score on node2: -INFINITY
+native_color: child_rsc1:3 allocation score on node1: 0
+native_color: child_rsc1:3 allocation score on node2: 20
native_color: child_rsc1:4 allocation score on node1: -INFINITY
native_color: child_rsc1:4 allocation score on node2: -INFINITY
diff --git a/pengine/test10/master-2.summary b/pengine/test10/master-2.summary
index 391bf83feb..6d872b46ab 100644
--- a/pengine/test10/master-2.summary
+++ b/pengine/test10/master-2.summary
@@ -1,68 +1,69 @@
Current cluster status:
Online: [ node1 node2 ]
Master/Slave Set: rsc1 [child_rsc1] (unique)
child_rsc1:0 (ocf::heartbeat:apache): Stopped
child_rsc1:1 (ocf::heartbeat:apache): Stopped
child_rsc1:2 (ocf::heartbeat:apache): Stopped
child_rsc1:3 (ocf::heartbeat:apache): Stopped
child_rsc1:4 (ocf::heartbeat:apache): Stopped
Transition Summary:
* Promote child_rsc1:0 (Stopped -> Master node1)
* Start child_rsc1:1 (node2)
* Start child_rsc1:2 (node1)
- * Start child_rsc1:3 (node2)
+ * Promote child_rsc1:3 ( Stopped -> Master node2 )
Executing cluster transition:
* Resource action: child_rsc1:0 monitor on node2
* Resource action: child_rsc1:0 monitor on node1
* Resource action: child_rsc1:1 monitor on node2
* Resource action: child_rsc1:1 monitor on node1
* Resource action: child_rsc1:2 monitor on node2
* Resource action: child_rsc1:2 monitor on node1
* Resource action: child_rsc1:3 monitor on node2
* Resource action: child_rsc1:3 monitor on node1
* Resource action: child_rsc1:4 monitor on node2
* Resource action: child_rsc1:4 monitor on node1
* Pseudo action: rsc1_pre_notify_start_0
* Pseudo action: rsc1_confirmed-pre_notify_start_0
* Pseudo action: rsc1_start_0
* Resource action: child_rsc1:0 start on node1
* Resource action: child_rsc1:1 start on node2
* Resource action: child_rsc1:2 start on node1
* Resource action: child_rsc1:3 start on node2
* Pseudo action: rsc1_running_0
* Pseudo action: rsc1_post_notify_running_0
* Resource action: child_rsc1:0 notify on node1
* Resource action: child_rsc1:1 notify on node2
* Resource action: child_rsc1:2 notify on node1
* Resource action: child_rsc1:3 notify on node2
* Pseudo action: rsc1_confirmed-post_notify_running_0
* Pseudo action: rsc1_pre_notify_promote_0
* Resource action: child_rsc1:0 notify on node1
* Resource action: child_rsc1:1 notify on node2
* Resource action: child_rsc1:2 notify on node1
* Resource action: child_rsc1:3 notify on node2
* Pseudo action: rsc1_confirmed-pre_notify_promote_0
* Pseudo action: rsc1_promote_0
* Resource action: child_rsc1:0 promote on node1
+ * Resource action: child_rsc1:3 promote on node2
* Pseudo action: rsc1_promoted_0
* Pseudo action: rsc1_post_notify_promoted_0
* Resource action: child_rsc1:0 notify on node1
* Resource action: child_rsc1:1 notify on node2
* Resource action: child_rsc1:2 notify on node1
* Resource action: child_rsc1:3 notify on node2
* Pseudo action: rsc1_confirmed-post_notify_promoted_0
Revised cluster status:
Online: [ node1 node2 ]
Master/Slave Set: rsc1 [child_rsc1] (unique)
child_rsc1:0 (ocf::heartbeat:apache): Master node1
child_rsc1:1 (ocf::heartbeat:apache): Slave node2
child_rsc1:2 (ocf::heartbeat:apache): Slave node1
- child_rsc1:3 (ocf::heartbeat:apache): Slave node2
+ child_rsc1:3 (ocf::heartbeat:apache): Master node2
child_rsc1:4 (ocf::heartbeat:apache): Stopped