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])
----------------------------------------------------------------------
Message: 1
Date: Thu, 9 Mar 2006 14:36:39 -0700 (MST)
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:
bad3.dot bad3.exp bad4.dot bad4.exp bad6.dot bad6.exp
Log Message:
Implement support for "failure stickiness"
- how much we prefer not to stay running on a node after a resource has
failed on it
Break up the monolythic unpack_lrm_rsc_state function into more manageable
pieces
Continue processing orphan resources to see if they're active
Update some test output
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad3.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- bad3.dot 13 Oct 2005 12:19:53 -0000 1.7
+++ bad3.dot 9 Mar 2006 21:36:39 -0000 1.8
@@ -1,12 +1,17 @@
digraph "g" {
size = "30,30"
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
+"lrm_refresh node1" [ style=bold color="green" fontcolor="black" ]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"probe_complete node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
+"rsc1_delete_0 node1" -> "lrm_refresh node1" [ style = bold]
"probe_complete node1" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
+"rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad3.exp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- bad3.exp 8 Mar 2006 15:51:35 -0000 1.21
+++ bad3.exp 9 Mar 2006 21:36:39 -0000 1.22
@@ -10,16 +10,29 @@
</synapse>
<synapse id="1">
<action_set>
- <rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc1" type="apache" priority="1.0"/>
+ <attributes crm_feature_set="1.0.4"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="1" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" type="apache" priority="1.0"/>
<attributes te-target-rc="7" lrm-is-probe="true"
crm_feature_set="1.0.4"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="3">
<action_set>
- <rsc_op id="5" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" type="apache" priority="1.0"/>
<attributes crm_feature_set="1.0.4"/>
</rsc_op>
@@ -29,31 +42,46 @@
<rsc_op id="1" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="4" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="4">
<action_set>
- <pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete">
+ <crm_event id="3" operation="lrm_refresh" operation_key="lrm_refresh"
on_node="node1" on_node_uuid="node1">
+ <attributes crm_feature_set="1.0.4" te-no-wait="true"/>
+ </crm_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <pseudo_event id="4" operation="probe_complete"
operation_key="probe_complete">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
- <synapse id="4">
+ <synapse id="6">
<action_set>
- <rsc_op id="3" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
<attributes crm_feature_set="1.0.4" te-no-wait="true"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad4.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- bad4.dot 13 Oct 2005 12:19:53 -0000 1.7
+++ bad4.dot 9 Mar 2006 21:36:39 -0000 1.8
@@ -1,12 +1,17 @@
digraph "g" {
size = "30,30"
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
+"lrm_refresh node1" [ style=bold color="green" fontcolor="black" ]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"probe_complete node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
+"rsc1_delete_0 node1" -> "lrm_refresh node1" [ style = bold]
"probe_complete node1" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
+"rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad4.exp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- bad4.exp 8 Mar 2006 15:51:35 -0000 1.18
+++ bad4.exp 9 Mar 2006 21:36:39 -0000 1.19
@@ -10,16 +10,29 @@
</synapse>
<synapse id="1">
<action_set>
- <rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc1" class="heartbeat" priority="1.0"/>
+ <attributes crm_feature_set="1.0.4"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="1" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" priority="1.0"/>
<attributes te-target-rc="7" lrm-is-probe="true"
crm_feature_set="1.0.4"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="3">
<action_set>
- <rsc_op id="5" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" priority="1.0"/>
<attributes crm_feature_set="1.0.4"/>
</rsc_op>
@@ -29,31 +42,46 @@
<rsc_op id="1" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="4" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="4">
<action_set>
- <pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete">
+ <crm_event id="3" operation="lrm_refresh" operation_key="lrm_refresh"
on_node="node1" on_node_uuid="node1">
+ <attributes crm_feature_set="1.0.4" te-no-wait="true"/>
+ </crm_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <pseudo_event id="4" operation="probe_complete"
operation_key="probe_complete">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
- <synapse id="4">
+ <synapse id="6">
<action_set>
- <rsc_op id="3" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
<attributes crm_feature_set="1.0.4" te-no-wait="true"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad6.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- bad6.dot 13 Oct 2005 12:19:53 -0000 1.7
+++ bad6.dot 9 Mar 2006 21:36:39 -0000 1.8
@@ -1,12 +1,17 @@
digraph "g" {
size = "30,30"
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
+"lrm_refresh node1" [ style=bold color="green" fontcolor="black" ]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"probe_complete node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
+"rsc1_delete_0 node1" -> "lrm_refresh node1" [ style = bold]
"probe_complete node1" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
+"rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad6.exp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- bad6.exp 8 Mar 2006 15:51:35 -0000 1.22
+++ bad6.exp 9 Mar 2006 21:36:39 -0000 1.23
@@ -10,16 +10,29 @@
</synapse>
<synapse id="1">
<action_set>
- <rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+ <attributes crm_feature_set="1.0.4"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="1" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
<attributes te-target-rc="7" lrm-is-probe="true"
crm_feature_set="1.0.4"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="3">
<action_set>
- <rsc_op id="5" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
<attributes crm_feature_set="1.0.4"/>
</rsc_op>
@@ -29,31 +42,46 @@
<rsc_op id="1" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="4" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="4">
<action_set>
- <pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete">
+ <crm_event id="3" operation="lrm_refresh" operation_key="lrm_refresh"
on_node="node1" on_node_uuid="node1">
+ <attributes crm_feature_set="1.0.4" te-no-wait="true"/>
+ </crm_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="2" rsc_id="rsc1" operation="delete"
operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <pseudo_event id="4" operation="probe_complete"
operation_key="probe_complete">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
- <synapse id="4">
+ <synapse id="6">
<action_set>
- <rsc_op id="3" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete"
operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
<attributes crm_feature_set="1.0.4" te-no-wait="true"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 16
********************************************
