Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 18 Jul 2006 00:19:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine/testcases
Modified Files:
829.dot 829.exp master-7.dot master-7.exp master-8.dot
master-8.exp rec-node-12.dot rec-node-12.exp
Log Message:
OSDL #1376 - Prevent graph loops due to STONITH
Stopping of stonith resources can never require stonith, even if the node its
running on failed.
---
crm/pengine/clone.c | 19 ---
crm/pengine/graph.c | 90 -----------------
crm/pengine/native.c | 180 ++++++++++++++++++++++++++++------
crm/pengine/testcases/829.dot | 1
crm/pengine/testcases/829.exp | 3
crm/pengine/testcases/master-7.dot | 1
crm/pengine/testcases/master-7.exp | 3
crm/pengine/testcases/master-8.dot | 1
crm/pengine/testcases/master-8.exp | 3
crm/pengine/testcases/rec-node-12.dot | 4
crm/pengine/testcases/rec-node-12.exp | 8 +
11 files changed, 164 insertions(+), 149 deletions(-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.dot,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- 829.dot 18 Jul 2006 06:15:57 -0000 1.17
+++ 829.dot 18 Jul 2006 06:19:33 -0000 1.18
@@ -53,7 +53,6 @@
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
"rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style =
bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold]
-"stonith c001n02" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold]
"child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.exp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- 829.exp 3 Jul 2006 11:50:49 -0000 1.27
+++ 829.exp 18 Jul 2006 06:19:33 -0000 1.28
@@ -158,9 +158,6 @@
<trigger>
<pseudo_event id="49" operation="stop"
operation_key="DoFencing_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="51" operation="stonith" operation_key="stonith"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
- </trigger>
</inputs>
</synapse>
<synapse id="16" priority="1000000">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.dot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- master-7.dot 18 Jul 2006 06:16:01 -0000 1.6
+++ master-7.dot 18 Jul 2006 06:19:33 -0000 1.7
@@ -93,7 +93,6 @@
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
"rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style =
bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
-"stonith c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
"master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.exp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- master-7.exp 3 Jul 2006 11:50:49 -0000 1.11
+++ master-7.exp 18 Jul 2006 06:19:33 -0000 1.12
@@ -299,9 +299,6 @@
<trigger>
<pseudo_event id="71" operation="stop"
operation_key="DoFencing_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
</inputs>
</synapse>
<synapse id="23" priority="1000000">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.dot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- master-8.dot 18 Jul 2006 06:16:01 -0000 1.6
+++ master-8.dot 18 Jul 2006 06:19:33 -0000 1.7
@@ -98,7 +98,6 @@
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
"rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style =
bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
-"stonith c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
"ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style =
bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- master-8.exp 3 Jul 2006 11:50:49 -0000 1.12
+++ master-8.exp 18 Jul 2006 06:19:33 -0000 1.13
@@ -299,9 +299,6 @@
<trigger>
<pseudo_event id="71" operation="stop"
operation_key="DoFencing_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
</inputs>
</synapse>
<synapse id="23" priority="1000000">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-12.dot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- rec-node-12.dot 18 Jul 2006 06:16:01 -0000 1.4
+++ rec-node-12.dot 18 Jul 2006 06:19:33 -0000 1.5
@@ -101,5 +101,7 @@
"child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = bold]
"child_DoFencing:2_start_0 c001n01" -> "DoFencing_running_0" [ style = bold]
"DoFencing_start_0" -> "DoFencing_running_0" [ style = bold]
-"DoFencing_running_0" -> "stonith c001n02" [ style = bold]
+"child_DoFencing:0_start_0 c001n08" -> "stonith c001n02" [ style = bold]
+"child_DoFencing:1_start_0 c001n03" -> "stonith c001n02" [ style = bold]
+"child_DoFencing:2_start_0 c001n01" -> "stonith c001n02" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-12.exp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- rec-node-12.exp 22 Jun 2006 16:23:31 -0000 1.9
+++ rec-node-12.exp 18 Jul 2006 06:19:33 -0000 1.10
@@ -617,7 +617,13 @@
</action_set>
<inputs>
<trigger>
- <pseudo_event id="49" operation="running"
operation_key="DoFencing_running_0"/>
+ <rsc_op id="42" operation="start"
operation_key="child_DoFencing:0_start_0" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="44" operation="start"
operation_key="child_DoFencing:1_start_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="46" operation="start"
operation_key="child_DoFencing:2_start_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
------------------------------
Message: 2
Date: Tue, 18 Jul 2006 00:20:08 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/cib
Modified Files:
callbacks.c
Log Message:
Always unpack the correct part of a diff operation
crm/cib/callbacks.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 59
********************************************
