|
 |
7100e8 |
commit d4c8712bfcf95eeb746887f1fc3de73ca878528a
|
|
|
7100e8 |
Author: Andrew Beekhof <andrew@beekhof.net>
|
|
|
7100e8 |
Date: Fri Feb 28 11:03:10 2014 +1100
|
|
|
7100e8 |
|
|
|
7100e8 |
Update regression tests for bz1069284 fix
|
|
|
7100e8 |
|
|
|
7100e8 |
diff --git a/pengine/test10/bug-lf-2435.dot b/pengine/test10/bug-lf-2435.dot
|
|
|
7100e8 |
index 2313c38..2d0b65d 100644
|
|
|
7100e8 |
--- a/pengine/test10/bug-lf-2435.dot
|
|
|
7100e8 |
+++ b/pengine/test10/bug-lf-2435.dot
|
|
|
7100e8 |
@@ -5,6 +5,7 @@ digraph "g" {
|
|
|
7100e8 |
"dummy2_stop_0 c20.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold]
|
|
|
7100e8 |
"dummy2_stop_0 c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
|
|
|
7100e8 |
"dummy3_stop_0 c21.chepkov.lan" -> "all_stopped" [ style = bold]
|
|
|
7100e8 |
+"dummy3_stop_0 c21.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold]
|
|
|
7100e8 |
"dummy3_stop_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
|
|
|
7100e8 |
"dummy4_monitor_0 c19.chepkov.lan" -> "probe_complete c19.chepkov.lan" [ style = bold]
|
|
|
7100e8 |
"dummy4_monitor_0 c19.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
|
|
|
7100e8 |
diff --git a/pengine/test10/bug-lf-2435.exp b/pengine/test10/bug-lf-2435.exp
|
|
|
7100e8 |
index 046dd97..7255127 100644
|
|
|
7100e8 |
--- a/pengine/test10/bug-lf-2435.exp
|
|
|
7100e8 |
+++ b/pengine/test10/bug-lf-2435.exp
|
|
|
7100e8 |
@@ -10,6 +10,9 @@
|
|
|
7100e8 |
<trigger>
|
|
|
7100e8 |
<rsc_op id="11" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
|
|
|
7100e8 |
</trigger>
|
|
|
7100e8 |
+ <trigger>
|
|
|
7100e8 |
+ <rsc_op id="13" operation="stop" operation_key="dummy3_stop_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
|
|
|
7100e8 |
+ </trigger>
|
|
|
7100e8 |
</inputs>
|
|
|
7100e8 |
</synapse>
|
|
|
7100e8 |
<synapse id="1">
|
|
|
7100e8 |
diff --git a/pengine/test10/simple6.dot b/pengine/test10/simple6.dot
|
|
|
7100e8 |
index ac3c495..3fac608 100644
|
|
|
7100e8 |
--- a/pengine/test10/simple6.dot
|
|
|
7100e8 |
+++ b/pengine/test10/simple6.dot
|
|
|
7100e8 |
@@ -6,6 +6,7 @@
|
|
|
7100e8 |
"probe_complete" -> "rsc2_start_0 node1" [ style = bold]
|
|
|
7100e8 |
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
|
|
|
7100e8 |
"rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
7100e8 |
+"rsc1_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold]
|
|
|
7100e8 |
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
7100e8 |
"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
|
|
|
7100e8 |
"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
7100e8 |
diff --git a/pengine/test10/simple6.exp b/pengine/test10/simple6.exp
|
|
|
7100e8 |
index 590e64b..79d230d 100644
|
|
|
7100e8 |
--- a/pengine/test10/simple6.exp
|
|
|
7100e8 |
+++ b/pengine/test10/simple6.exp
|
|
|
7100e8 |
@@ -10,6 +10,9 @@
|
|
|
7100e8 |
<trigger>
|
|
|
7100e8 |
<pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
|
|
|
7100e8 |
</trigger>
|
|
|
7100e8 |
+ <trigger>
|
|
|
7100e8 |
+ <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
|
|
|
7100e8 |
+ </trigger>
|
|
|
7100e8 |
</inputs>
|
|
|
7100e8 |
</synapse>
|
|
|
7100e8 |
<synapse id="1" priority="2">
|
|
|
7100e8 |
diff --git a/pengine/test10/simple6.summary b/pengine/test10/simple6.summary
|
|
|
7100e8 |
index 2c4079b..42dde4a 100644
|
|
|
7100e8 |
--- a/pengine/test10/simple6.summary
|
|
|
7100e8 |
+++ b/pengine/test10/simple6.summary
|
|
|
7100e8 |
@@ -12,9 +12,9 @@ Transition Summary:
|
|
|
7100e8 |
Executing cluster transition:
|
|
|
7100e8 |
* Resource action: rsc2 monitor on node1
|
|
|
7100e8 |
* Pseudo action: probe_complete
|
|
|
7100e8 |
- * Resource action: rsc2 start on node1
|
|
|
7100e8 |
* Resource action: rsc1 stop on node1
|
|
|
7100e8 |
* Pseudo action: all_stopped
|
|
|
7100e8 |
+ * Resource action: rsc2 start on node1
|
|
|
7100e8 |
|
|
|
7100e8 |
Revised cluster status:
|
|
|
7100e8 |
Online: [ node1 ]
|
|
|
7100e8 |
diff --git a/tools/regression.exp b/tools/regression.exp
|
|
|
7100e8 |
index ef27353..1682f72 100755
|
|
|
7100e8 |
--- a/tools/regression.exp
|
|
|
7100e8 |
+++ b/tools/regression.exp
|
|
|
7100e8 |
@@ -1317,7 +1317,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score
|
|
|
7100e8 |
<primitive id="Fence" class="stonith" type="fence_true"/>
|
|
|
7100e8 |
</resources>
|
|
|
7100e8 |
<constraints>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
</constraints>
|
|
|
7100e8 |
</configuration>
|
|
|
7100e8 |
<status>
|
|
|
7100e8 |
@@ -2027,7 +2027,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score
|
|
|
7100e8 |
<primitive id="Fence" class="stonith" type="fence_true"/>
|
|
|
7100e8 |
</resources>
|
|
|
7100e8 |
<constraints>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
</constraints>
|
|
|
7100e8 |
</configuration>
|
|
|
7100e8 |
<status>
|
|
|
7100e8 |
@@ -2113,8 +2113,8 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node2' with a score
|
|
|
7100e8 |
<primitive id="Fence" class="stonith" type="fence_true"/>
|
|
|
7100e8 |
</resources>
|
|
|
7100e8 |
<constraints>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" node="node2" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" role="Started" node="node2" score="-INFINITY"/>
|
|
|
7100e8 |
</constraints>
|
|
|
7100e8 |
</configuration>
|
|
|
7100e8 |
<status>
|
|
|
7100e8 |
@@ -2217,8 +2217,8 @@ Online: [ node1 node2 node3 ]
|
|
|
7100e8 |
<primitive id="Fence" class="stonith" type="fence_true"/>
|
|
|
7100e8 |
</resources>
|
|
|
7100e8 |
<constraints>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" node="node2" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" role="Started" node="node2" score="-INFINITY"/>
|
|
|
7100e8 |
</constraints>
|
|
|
7100e8 |
</configuration>
|
|
|
7100e8 |
<status>
|
|
|
7100e8 |
@@ -2300,8 +2300,8 @@ Online: [ node1 node2 node3 ]
|
|
|
7100e8 |
<primitive id="Fence" class="stonith" type="fence_true"/>
|
|
|
7100e8 |
</resources>
|
|
|
7100e8 |
<constraints>
|
|
|
7100e8 |
- <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" node="node2" score="-INFINITY"/>
|
|
|
7100e8 |
- <rsc_location id="cli-prefer-dummy" rsc="dummy" node="node1" score="INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" role="Started" node="node2" score="-INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-prefer-dummy" rsc="dummy" role="Started" node="node1" score="INFINITY"/>
|
|
|
7100e8 |
</constraints>
|
|
|
7100e8 |
</configuration>
|
|
|
7100e8 |
<status>
|
|
|
7100e8 |
@@ -2383,7 +2383,7 @@ Online: [ node1 node2 node3 ]
|
|
|
7100e8 |
<primitive id="Fence" class="stonith" type="fence_true"/>
|
|
|
7100e8 |
</resources>
|
|
|
7100e8 |
<constraints>
|
|
|
7100e8 |
- <rsc_location id="cli-prefer-dummy" rsc="dummy" node="node1" score="INFINITY"/>
|
|
|
7100e8 |
+ <rsc_location id="cli-prefer-dummy" rsc="dummy" role="Started" node="node1" score="INFINITY"/>
|
|
|
7100e8 |
</constraints>
|
|
|
7100e8 |
</configuration>
|
|
|
7100e8 |
<status>
|