• R/O
  • SSH

pm_diskd: Commit

※ リポジトリは、pm-diskd ブランチが https://github.com/linux-ha-japan/pm_diskd-1.0 へ、pm-diskd-2.0ブランチが https://github.com/linux-ha-japan/pm_diskd へ移行しました。

Pacemaker 対応ディスク故障監視機能。

Pacemaker-1.0公式リポジトリのクローンに対し、パッチ作成用のブランチを作成して管理する。
ブランチ名: pm-diskd

初回 hg clone 実行後は、hg update -r pm-diskd を実行すること。

Heartbeat-2.1.4 用 hb-diskd(*) のPacemaker対応版
(*) http://sourceforge.jp/projects/linux-ha/releases/?package_id=10555


Commit MetaInfo

Revision702e4f418ca82cf5248976a8da95a39b125166b8 (tree)
Time2007-09-26 16:28:36
AuthorAndrew Beekhof <beekhof@suse...>
CommiterAndrew Beekhof

Log Message

Medium: PE: Enact a saner default for rsc_order.score (s/0/INFINITY)
Default to INFINITY which makes the ordering required rather than only advisory
Given: <rsc_order from=A to=B>
* Start A before starting B and stop B before stopping A
* If A (re)starts while B is running, stop and restart B
* If A cannot be started, do not start B (and stop B if its currently running)
Set score=0 for the old (advisory-only) behavior

Change Summary

Incremental Difference

diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/allocate.c
--- a/crm/pengine/allocate.c Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/allocate.c Wed Sep 26 09:28:36 2007 +0200
@@ -975,11 +975,9 @@
975975 return FALSE;
976976 }
977977
978-#if 0
979978 if(score == NULL) {
980979 score = "INFINITY";
981980 }
982-#endif
983981
984982 score_i = char2score(score);
985983 cons_weight = pe_order_optional;
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/bug-1572-1.xml
--- a/crm/pengine/testcases/bug-1572-1.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/bug-1572-1.xml Wed Sep 26 09:28:36 2007 +0200
@@ -114,7 +114,7 @@
114114 </group>
115115 </resources>
116116 <constraints>
117- <rsc_order id="drbd_before_fs-1" from="grp_pgsql_mirror" type="after" action="start" to="ms_drbd_7788" to_action="promote"/>
117+ <rsc_order id="drbd_before_fs-1" from="grp_pgsql_mirror" type="after" action="start" to="ms_drbd_7788" to_action="promote" score="0"/>
118118 <rsc_location id="locate_drbd" rsc="ms_drbd_7788">
119119 <rule id="rule_drbd_on_tk" role="Master" score="100">
120120 <expression id="exp_drbd_on_tk" attribute="#uname" operation="eq" value="arc-tkincaidlx.wsicorp.com"/>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/bug-1572-2.xml
--- a/crm/pengine/testcases/bug-1572-2.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/bug-1572-2.xml Wed Sep 26 09:28:36 2007 +0200
@@ -110,7 +110,7 @@
110110 </group>
111111 </resources>
112112 <constraints>
113- <rsc_order id="drbd_before_fs-1" from="grp_pgsql_mirror" type="after" action="start" to="ms_drbd_7788" to_action="promote"/>
113+ <rsc_order id="drbd_before_fs-1" from="grp_pgsql_mirror" type="after" action="start" to="ms_drbd_7788" to_action="promote" score="0"/>
114114 <rsc_colocation id="fs_on_drbd_master" to="ms_drbd_7788" to_role="Master" from="grp_pgsql_mirror" score="INFINITY"/>
115115 </constraints>
116116 </configuration>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/group2.xml
--- a/crm/pengine/testcases/group2.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/group2.xml Wed Sep 26 09:28:36 2007 +0200
@@ -19,8 +19,8 @@
1919 <primitive id="rsc3" class="heartbeat" type="apache"/>
2020 </resources>
2121 <constraints>
22- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
23- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
22+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
23+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
2424 </constraints>
2525 </configuration>
2626 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/group3.xml
--- a/crm/pengine/testcases/group3.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/group3.xml Wed Sep 26 09:28:36 2007 +0200
@@ -22,7 +22,7 @@
2222 </group>
2323 </resources>
2424 <constraints>
25- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
25+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
2626 </constraints>
2727 </configuration>
2828 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/group4.xml
--- a/crm/pengine/testcases/group4.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/group4.xml Wed Sep 26 09:28:36 2007 +0200
@@ -20,8 +20,8 @@
2020 <primitive id="rsc3" class="heartbeat" type="apache"/>
2121 </resources>
2222 <constraints>
23- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
24- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
23+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
24+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
2525 <rsc_location id="run_rsc1" rsc="rsc1">
2626 <rule id="can1-1" score="1">
2727 <expression attribute="#uname" operation="eq" value="node2"/>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/group5.xml
--- a/crm/pengine/testcases/group5.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/group5.xml Wed Sep 26 09:28:36 2007 +0200
@@ -19,8 +19,8 @@
1919 <primitive id="rsc3" class="heartbeat" type="apache"/>
2020 </resources>
2121 <constraints>
22- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
23- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
22+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
23+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
2424 <rsc_location id="run_rsc1" rsc="rsc1">
2525 <rule id="can1-1" score="1">
2626 <expression attribute="#uname" operation="eq" value="node2"/>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/group6.xml
--- a/crm/pengine/testcases/group6.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/group6.xml Wed Sep 26 09:28:36 2007 +0200
@@ -22,7 +22,7 @@
2222 </group>
2323 </resources>
2424 <constraints>
25- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
25+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
2626 <rsc_location id="run_rsc1" rsc="rsc1">
2727 <rule id="can1-1" score="1">
2828 <expression attribute="#uname" operation="eq" value="node2"/>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/group7.xml
--- a/crm/pengine/testcases/group7.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/group7.xml Wed Sep 26 09:28:36 2007 +0200
@@ -24,7 +24,7 @@
2424 </group>
2525 </resources>
2626 <constraints>
27- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
27+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
2828 <rsc_colocation id="coloc1" from="rsc2" to="rsc3" score="INFINITY"/>
2929 </constraints>
3030 </configuration>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/inc1.xml
--- a/crm/pengine/testcases/inc1.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/inc1.xml Wed Sep 26 09:28:36 2007 +0200
@@ -24,8 +24,8 @@
2424 <primitive id="rsc3" class="heartbeat" type="apache"/>
2525 </resources>
2626 <constraints>
27- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
28- <rsc_order id="order1" from="rsc2" type="before" to="rsc3"/>
27+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
28+ <rsc_order id="order1" from="rsc2" type="before" to="rsc3" score="0"/>
2929 </constraints>
3030 </configuration>
3131 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/inc3.xml
--- a/crm/pengine/testcases/inc3.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/inc3.xml Wed Sep 26 09:28:36 2007 +0200
@@ -31,7 +31,7 @@
3131 </clone>
3232 </resources>
3333 <constraints>
34- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
34+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
3535 </constraints>
3636 </configuration>
3737 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/inc4.xml
--- a/crm/pengine/testcases/inc4.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/inc4.xml Wed Sep 26 09:28:36 2007 +0200
@@ -32,7 +32,7 @@
3232 </clone>
3333 </resources>
3434 <constraints>
35- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
35+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
3636 </constraints>
3737 </configuration>
3838 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/inc5.xml
--- a/crm/pengine/testcases/inc5.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/inc5.xml Wed Sep 26 09:28:36 2007 +0200
@@ -92,10 +92,10 @@
9292 </clone>
9393 </resources>
9494 <constraints>
95- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
96- <rsc_order id="order2" from="rsc3" type="before" to="rsc4"/>
97- <rsc_order id="order3" from="rsc5" type="before" to="rsc6"/>
98- <rsc_order id="order4" from="rsc7" type="before" to="rsc8"/>
95+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
96+ <rsc_order id="order2" from="rsc3" type="before" to="rsc4" score="0"/>
97+ <rsc_order id="order3" from="rsc5" type="before" to="rsc6" score="0"/>
98+ <rsc_order id="order4" from="rsc7" type="before" to="rsc8" score="0"/>
9999 </constraints>
100100 </configuration>
101101 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/inc6.xml
--- a/crm/pengine/testcases/inc6.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/inc6.xml Wed Sep 26 09:28:36 2007 +0200
@@ -92,10 +92,10 @@
9292 </clone>
9393 </resources>
9494 <constraints>
95- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
96- <rsc_order id="order2" from="rsc3" type="before" to="rsc4"/>
97- <rsc_order id="order3" from="rsc5" type="before" to="rsc6"/>
98- <rsc_order id="order4" from="rsc7" type="before" to="rsc8"/>
95+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
96+ <rsc_order id="order2" from="rsc3" type="before" to="rsc4" score="0"/>
97+ <rsc_order id="order3" from="rsc5" type="before" to="rsc6" score="0"/>
98+ <rsc_order id="order4" from="rsc7" type="before" to="rsc8" score="0"/>
9999 </constraints>
100100 </configuration>
101101 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/inc7.xml
--- a/crm/pengine/testcases/inc7.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/inc7.xml Wed Sep 26 09:28:36 2007 +0200
@@ -34,7 +34,7 @@
3434 </clone>
3535 </resources>
3636 <constraints>
37- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
37+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
3838 <rsc_colocation id="order1" from="rsc1" to="rsc2" score="INFINITY"/>
3939 </constraints>
4040 </configuration>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/master-12.xml
--- a/crm/pengine/testcases/master-12.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/master-12.xml Wed Sep 26 09:28:36 2007 +0200
@@ -68,8 +68,8 @@
6868 <expression id="prefered_location_group_1_expr" attribute="#uname" operation="eq" value="sel3"/>
6969 </rule>
7070 </rsc_location>
71- <rsc_order id="drbd0_before_fs0" from="fs0" action="start" to="ms-drbd0" to_action="promote"/>
72- <rsc_order id="sf_before_fs0" from="fs0" action="start" to="ms-sf" to_action="promote"/>
71+ <rsc_order id="drbd0_before_fs0" from="fs0" action="start" to="ms-drbd0" to_action="promote" score="0"/>
72+ <rsc_order id="sf_before_fs0" from="fs0" action="start" to="ms-sf" to_action="promote" score="0"/>
7373 <rsc_colocation id="fs0_on_drbd0" to="ms-drbd0" to_role="master" from="fs0" score="infinity"/>
7474 </constraints>
7575 </configuration>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/master-13.xml
--- a/crm/pengine/testcases/master-13.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/master-13.xml Wed Sep 26 09:28:36 2007 +0200
@@ -84,7 +84,7 @@
8484 <expression id="connected_rule_zero" attribute="pingd" operation="lte" value="0"/>
8585 </rule>
8686 </rsc_location>
87- <rsc_order id="drbd_before_group" from="group" to="ms_drbd" action="start" to_action="promote"/>
87+ <rsc_order id="drbd_before_group" from="group" to="ms_drbd" action="start" to_action="promote" score="0"/>
8888 <rsc_colocation id="group_on_drbd" from="group" to="ms_drbd" to_role="Master" score="INFINITY"/>
8989 </constraints>
9090 </configuration>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-239079.xml
--- a/crm/pengine/testcases/novell-239079.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-239079.xml Wed Sep 26 09:28:36 2007 +0200
@@ -62,9 +62,9 @@
6262 </master_slave>
6363 </resources>
6464 <constraints>
65- <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote"/>
65+ <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote" score="0"/>
6666 <rsc_colocation id="fs_on_drbd0" to="ms-drbd0" to_role="master" from="fs_1" score="infinity"/>
67- <rsc_order id="promote_after_demote" from="ms-drbd0" action="pre_notify_promote" to="ms-drbd0" to_action="confirmed-post_notify_demote"/>
67+ <rsc_order id="promote_after_demote" from="ms-drbd0" action="pre_notify_promote" to="ms-drbd0" to_action="confirmed-post_notify_demote" score="0"/>
6868 </constraints>
6969 </configuration>
7070 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-239082.xml
--- a/crm/pengine/testcases/novell-239082.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-239082.xml Wed Sep 26 09:28:36 2007 +0200
@@ -62,7 +62,7 @@
6262 </master_slave>
6363 </resources>
6464 <constraints>
65- <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote"/>
65+ <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote" score="0"/>
6666 <rsc_colocation id="fs_on_drbd0" to="ms-drbd0" to_role="master" from="fs_1" score="infinity"/>
6767 </constraints>
6868 </configuration>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-239087.xml
--- a/crm/pengine/testcases/novell-239087.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-239087.xml Wed Sep 26 09:28:36 2007 +0200
@@ -62,9 +62,9 @@
6262 </master_slave>
6363 </resources>
6464 <constraints>
65- <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote"/>
65+ <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote" score="0"/>
6666 <rsc_colocation id="fs_on_drbd0" to="ms-drbd0" to_role="master" from="fs_1" score="infinity"/>
67- <rsc_order id="promote_after_demote" from="ms-drbd0" action="pre_notify_promote" to="ms-drbd0" to_action="confirmed-post_notify_demote"/>
67+ <rsc_order id="promote_after_demote" from="ms-drbd0" action="pre_notify_promote" to="ms-drbd0" to_action="confirmed-post_notify_demote" score="0"/>
6868 </constraints>
6969 </configuration>
7070 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-251689.xml
--- a/crm/pengine/testcases/novell-251689.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-251689.xml Wed Sep 26 09:28:36 2007 +0200
@@ -116,9 +116,9 @@
116116 </primitive>
117117 </resources>
118118 <constraints>
119- <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset"/>
120- <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset"/>
121- <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset"/>
119+ <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset" score="0"/>
120+ <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset" score="0"/>
121+ <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset" score="0"/>
122122 </constraints>
123123 </configuration>
124124 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-252693-2.xml
--- a/crm/pengine/testcases/novell-252693-2.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-252693-2.xml Wed Sep 26 09:28:36 2007 +0200
@@ -117,16 +117,16 @@
117117 </primitive>
118118 </resources>
119119 <constraints>
120- <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset"/>
121- <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset"/>
122- <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset"/>
120+ <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset" score="0"/>
121+ <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset" score="0"/>
122+ <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset" score="0"/>
123123 <rsc_location id="sles10_location" rsc="sles10">
124124 <rule id="pref_sles10_location" score="INFINITY">
125125 <expression attribute="#uname" operation="eq" value="node1" id="fdef446b-1e3a-4957-861c-bece0b861763"/>
126126 </rule>
127127 </rsc_location>
128- <rsc_order id="vm1orderconstraints-01" from="sles10" to="imagestorecloneset"/>
129- <rsc_order id="vm1orderconstraints-02" from="sles10" to="configstorecloneset"/>
128+ <rsc_order id="vm1orderconstraints-01" from="sles10" to="imagestorecloneset" score="0"/>
129+ <rsc_order id="vm1orderconstraints-02" from="sles10" to="configstorecloneset" score="0"/>
130130 </constraints>
131131 </configuration>
132132 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-252693-3.xml
--- a/crm/pengine/testcases/novell-252693-3.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-252693-3.xml Wed Sep 26 09:28:36 2007 +0200
@@ -118,16 +118,16 @@
118118 </primitive>
119119 </resources>
120120 <constraints>
121- <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset"/>
122- <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset"/>
123- <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset"/>
121+ <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset" score="0"/>
122+ <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset" score="0"/>
123+ <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset" score="0"/>
124124 <rsc_location id="sles10_location" rsc="sles10">
125125 <rule id="pref_sles10_location" score="INFINITY">
126126 <expression attribute="#uname" operation="eq" value="node1" id="fdef446b-1e3a-4957-861c-bece0b861763"/>
127127 </rule>
128128 </rsc_location>
129- <rsc_order id="vm1orderconstraints-01" from="sles10" to="imagestorecloneset"/>
130- <rsc_order id="vm1orderconstraints-02" from="sles10" to="configstorecloneset"/>
129+ <rsc_order id="vm1orderconstraints-01" from="sles10" to="imagestorecloneset" score="0"/>
130+ <rsc_order id="vm1orderconstraints-02" from="sles10" to="configstorecloneset" score="0"/>
131131 </constraints>
132132 </configuration>
133133 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/novell-252693.xml
--- a/crm/pengine/testcases/novell-252693.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/novell-252693.xml Wed Sep 26 09:28:36 2007 +0200
@@ -115,16 +115,16 @@
115115 </primitive>
116116 </resources>
117117 <constraints>
118- <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset"/>
119- <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset"/>
120- <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset"/>
118+ <rsc_order id="evmsdorderconstraints-01" from="evmscloneset" to="evmsdcloneset" score="0"/>
119+ <rsc_order id="evmsorderconstraints-02" from="configstorecloneset" to="evmscloneset" score="0"/>
120+ <rsc_order id="evmsorderconstraints-01" from="imagestorecloneset" to="evmscloneset" score="0"/>
121121 <rsc_location id="sles10_location" rsc="sles10">
122122 <rule id="pref_sles10_location" score="INFINITY">
123123 <expression attribute="#uname" operation="eq" value="node1" id="f736636b-8aa1-40b4-9386-ed258bc9aaf6"/>
124124 </rule>
125125 </rsc_location>
126- <rsc_order id="vm1orderconstraints-02" from="sles10" to="configstorecloneset"/>
127- <rsc_order id="vm1orderconstraints-01" from="sles10" to="imagestorecloneset"/>
126+ <rsc_order id="vm1orderconstraints-02" from="sles10" to="configstorecloneset" score="0"/>
127+ <rsc_order id="vm1orderconstraints-01" from="sles10" to="imagestorecloneset" score="0"/>
128128 </constraints>
129129 </configuration>
130130 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order1.xml
--- a/crm/pengine/testcases/order1.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order1.xml Wed Sep 26 09:28:36 2007 +0200
@@ -15,8 +15,8 @@
1515 <primitive id="rsc3" class="heartbeat" type="apache"/>
1616 </resources>
1717 <constraints>
18- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
19- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
18+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
19+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
2020 </constraints>
2121 </configuration>
2222 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order2.xml
--- a/crm/pengine/testcases/order2.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order2.xml Wed Sep 26 09:28:36 2007 +0200
@@ -16,9 +16,9 @@
1616 <primitive id="rsc4" class="heartbeat" type="apache"/>
1717 </resources>
1818 <constraints>
19- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
20- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
21- <rsc_order id="order3" from="rsc2" type="after" to="rsc4"/>
19+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
20+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
21+ <rsc_order id="order3" from="rsc2" type="after" to="rsc4" score="0"/>
2222 </constraints>
2323 </configuration>
2424 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order3.xml
--- a/crm/pengine/testcases/order3.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order3.xml Wed Sep 26 09:28:36 2007 +0200
@@ -17,9 +17,9 @@
1717 <primitive id="rsc4" class="heartbeat" type="apache"/>
1818 </resources>
1919 <constraints>
20- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
21- <rsc_order id="order2" from="rsc2" type="before" to="rsc3"/>
22- <rsc_order id="order3" from="rsc2" type="after" to="rsc4"/>
20+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
21+ <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
22+ <rsc_order id="order3" from="rsc2" type="after" to="rsc4" score="0"/>
2323 <rsc_location id="run_rsc1" rsc="rsc1">
2424 <rule id="can1-1" score="1">
2525 <expression attribute="#uname" operation="eq" value="node2"/>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order4.xml
--- a/crm/pengine/testcases/order4.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order4.xml Wed Sep 26 09:28:36 2007 +0200
@@ -15,10 +15,10 @@
1515 <primitive id="rsc3" class="heartbeat" type="apache"/>
1616 </resources>
1717 <constraints>
18- <rsc_order id="order1" from="rsc2" type="after" to="rsc1"/>
19- <rsc_order id="order2" from="rsc2" type="after" to="rsc1"/>
20- <rsc_order id="order3" from="rsc2" type="before" to="rsc3"/>
21- <rsc_order id="order4" from="rsc2" type="before" to="rsc3"/>
18+ <rsc_order id="order1" from="rsc2" type="after" to="rsc1" score="0"/>
19+ <rsc_order id="order2" from="rsc2" type="after" to="rsc1" score="0"/>
20+ <rsc_order id="order3" from="rsc2" type="before" to="rsc3" score="0"/>
21+ <rsc_order id="order4" from="rsc2" type="before" to="rsc3" score="0"/>
2222 </constraints>
2323 </configuration>
2424 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order5.xml
--- a/crm/pengine/testcases/order5.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order5.xml Wed Sep 26 09:28:36 2007 +0200
@@ -20,10 +20,10 @@
2020 <primitive id="rsc8" class="heartbeat" type="apache"/>
2121 </resources>
2222 <constraints>
23- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
24- <rsc_order id="order2" from="rsc3" type="before" to="rsc4"/>
25- <rsc_order id="order3" from="rsc5" type="before" to="rsc6"/>
26- <rsc_order id="order4" from="rsc7" type="before" to="rsc8"/>
23+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
24+ <rsc_order id="order2" from="rsc3" type="before" to="rsc4" score="0"/>
25+ <rsc_order id="order3" from="rsc5" type="before" to="rsc6" score="0"/>
26+ <rsc_order id="order4" from="rsc7" type="before" to="rsc8" score="0"/>
2727 </constraints>
2828 </configuration>
2929 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order6.xml
--- a/crm/pengine/testcases/order6.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order6.xml Wed Sep 26 09:28:36 2007 +0200
@@ -20,10 +20,10 @@
2020 <primitive id="rsc8" class="heartbeat" type="apache"/>
2121 </resources>
2222 <constraints>
23- <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
24- <rsc_order id="order2" from="rsc3" type="before" to="rsc4"/>
25- <rsc_order id="order3" from="rsc5" type="before" to="rsc6"/>
26- <rsc_order id="order4" from="rsc7" type="before" to="rsc8"/>
23+ <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
24+ <rsc_order id="order2" from="rsc3" type="before" to="rsc4" score="0"/>
25+ <rsc_order id="order3" from="rsc5" type="before" to="rsc6" score="0"/>
26+ <rsc_order id="order4" from="rsc7" type="before" to="rsc8" score="0"/>
2727 </constraints>
2828 </configuration>
2929 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/order7.xml
--- a/crm/pengine/testcases/order7.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/order7.xml Wed Sep 26 09:28:36 2007 +0200
@@ -17,10 +17,10 @@
1717 <primitive id="rscC" class="heartbeat" type="apache"/>
1818 </resources>
1919 <constraints>
20- <rsc_order id="order1" from="rsc2" action="start" type="after" to="rsc1"/>
20+ <rsc_order id="order1" from="rsc2" action="start" type="after" to="rsc1" score="0"/>
2121 <rsc_order id="order2" from="rsc3" action="start" type="after" to="rsc1" score="100"/>
2222 <!-- start rsc1 before rsc3, stop rsc3 before rsc1 -->
23- <rsc_order id="order3" from="rscB" action="start" type="after" to="rscA"/>
23+ <rsc_order id="order3" from="rscB" action="start" type="after" to="rscA" score="0"/>
2424 <rsc_order id="order4" from="rscC" action="start" type="after" to="rscA" score="100"/>
2525 <!-- start rscA before rscC, stop rscC before rscA -->
2626 </constraints>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/rec-node-11.xml
--- a/crm/pengine/testcases/rec-node-11.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/rec-node-11.xml Wed Sep 26 09:28:36 2007 +0200
@@ -26,7 +26,7 @@
2626 <primitive id="rsc3" class="heartbeat" type="apache" restart_type="restart"/>
2727 </resources>
2828 <constraints>
29- <rsc_order id="order1" from="rsc3" type="after" action="stop" to="group1"/>
29+ <rsc_order id="order1" from="rsc3" type="after" action="stop" to="group1" score="0"/>
3030 </constraints>
3131 </configuration>
3232 <status>
diff -r 5b9b532fe8ef -r 702e4f418ca8 crm/pengine/testcases/rec-rsc-9.xml
--- a/crm/pengine/testcases/rec-rsc-9.xml Tue Sep 25 16:43:21 2007 +0200
+++ b/crm/pengine/testcases/rec-rsc-9.xml Wed Sep 26 09:28:36 2007 +0200
@@ -26,8 +26,8 @@
2626 </group>
2727 </resources>
2828 <constraints>
29- <rsc_order id="order_recover" from="rsc1" type="after" to="bar"/>
30- <rsc_order id="order_recover" from="foo" type="after" to="bar"/>
29+ <rsc_order id="order_recover" from="rsc1" type="after" to="bar" score="0"/>
30+ <rsc_order id="order_recover" from="foo" type="after" to="bar" score="0"/>
3131 </constraints>
3232 </configuration>
3333 <status>
Show on old repository browser