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: include by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 31 Mar 2006 05:05:38 -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
Modified Files:
native.c pe_utils.h utils.c
Log Message:
In some circumstances (usually when a resource has changed *and* is being
moved, manditory actions may exist for the resource at its previous
location (such as monitoring)... we need to cancel these.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- native.c 28 Mar 2006 06:12:23 -0000 1.121
+++ native.c 31 Mar 2006 12:05:37 -0000 1.122
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.121 2006/03/28 06:12:23 andrew Exp $ */
+/* $Id: native.c,v 1.122 2006/03/31 12:05:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -403,6 +403,7 @@
xml_child_iter_filter(
rsc->ops_xml, operation, "op",
+ is_optional = TRUE;
name = crm_element_value(operation, "name");
interval = crm_element_value(operation, "interval");
interval_ms = crm_get_msec(interval);
@@ -1798,7 +1799,7 @@
void
pe_post_notify(resource_t *rsc, node_t *node, action_t *op,
- notify_data_t *n_data, pe_working_set_t *data_set)
+ notify_data_t *n_data, pe_working_set_t *data_set)
{
crm_debug_2("%s: %s", rsc->id, op->uuid);
pe_notify(rsc, node, op->post_notify, op->post_notified,
@@ -1807,10 +1808,12 @@
void
-NoRoleChange(resource_t *rsc, node_t *current, node_t *next, pe_working_set_t
*data_set)
+NoRoleChange(resource_t *rsc, node_t *current, node_t *next,
+ pe_working_set_t *data_set)
{
action_t *start = NULL;
action_t *stop = NULL;
+ GListPtr possible_matches = NULL;
crm_debug("Executing: %s (role=%s)",rsc->id, role2text(rsc->next_role));
@@ -1827,6 +1830,15 @@
stop = stop_action(rsc, current, FALSE);
start = start_action(rsc, next, FALSE);
+ possible_matches = find_recurring_actions(rsc->actions, next);
+ slist_iter(match, action_t, possible_matches, lpc,
+ if(match->optional == FALSE) {
+ crm_err("Found bad recurring action: %s",
+ match->uuid);
+ match->optional = TRUE;
+ }
+ );
+
if(data_set->remove_after_stop) {
DeleteRsc(rsc, current, data_set);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pe_utils.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- pe_utils.h 27 Mar 2006 05:44:24 -0000 1.40
+++ pe_utils.h 31 Mar 2006 12:05:37 -0000 1.41
@@ -1,4 +1,4 @@
-/* $Id: pe_utils.h,v 1.40 2006/03/27 05:44:24 andrew Exp $ */
+/* $Id: pe_utils.h,v 1.41 2006/03/31 12:05:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -165,6 +165,7 @@
extern GListPtr find_actions(GListPtr input, const char *key, node_t *on_node);
extern GListPtr find_actions_exact(
GListPtr input, const char *key, node_t *on_node);
+extern GListPtr find_recurring_actions(GListPtr input, node_t *not_on_node);
extern void set_id(crm_data_t *xml_obj, const char *prefix, int child);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- utils.c 27 Mar 2006 05:44:24 -0000 1.127
+++ utils.c 31 Mar 2006 12:05:37 -0000 1.128
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.127 2006/03/27 05:44:24 andrew Exp $ */
+/* $Id: utils.c,v 1.128 2006/03/31 12:05:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1637,6 +1637,35 @@
}
GListPtr
+find_recurring_actions(GListPtr input, node_t *not_on_node)
+{
+ const char *value = NULL;
+ GListPtr result = NULL;
+ CRM_CHECK(input != NULL, return NULL);
+
+ slist_iter(
+ action, action_t, input, lpc,
+ value = g_hash_table_lookup(action->extra, "interval");
+ if(value == NULL) {
+ /* skip */
+ } else if(safe_str_eq(CRMD_ACTION_CANCEL, action->task)) {
+ /* skip */
+ } else if(not_on_node == NULL) {
+ crm_debug_5("(null) Found: %s", action->uuid);
+ result = g_list_append(result, action);
+
+ } else if(action->node == NULL) {
+ /* skip */
+ } else if(action->node->details != not_on_node->details) {
+ crm_debug_5("Found: %s", action->uuid);
+ result = g_list_append(result, action);
+ }
+ );
+
+ return result;
+}
+
+GListPtr
find_actions(GListPtr input, const char *key, node_t *on_node)
{
GListPtr result = NULL;
------------------------------
Message: 2
Date: Fri, 31 Mar 2006 05:07:20 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
util.h
Log Message:
util function
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- util.h 17 Mar 2006 17:59:32 -0000 1.29
+++ util.h 31 Mar 2006 12:07:20 -0000 1.30
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.29 2006/03/17 17:59:32 andrew Exp $ */
+/* $Id: util.h,v 1.30 2006/03/31 12:07:20 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -113,6 +113,7 @@
extern gboolean decode_op_key(
const char *key, char **rsc_id, char **op_type, int *interval);
+extern void filter_action_parameters(crm_data_t *param_set);
extern gboolean safe_str_eq(const char *a, const char *b);
extern gboolean safe_str_neq(const char *a, const char *b);
------------------------------
Message: 3
Date: Fri, 31 Mar 2006 05:09:33 -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:
994.dot 994.exp group10.dot group10.exp master-6.xml
rec-node-10.xml rec-node-11.xml rec-node-3.xml rec-node-4.xml
rec-node-5.xml rec-node-6.xml rec-node-7.xml rec-node-8.xml
rec-node-9.xml rec-rsc-3.xml rec-rsc-4.xml rec-rsc-5.xml
Log Message:
Update the testcases (mostly not to use rc=7 for stop failures)
Also group10 was *really* broken, dont know how that slipped through
but it does the right thing now.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/994.dot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- 994.dot 26 Mar 2006 16:53:13 -0000 1.2
+++ 994.dot 31 Mar 2006 12:09:31 -0000 1.3
@@ -4,6 +4,7 @@
"group_1:postfix_9_monitor_0 <none>" [ style="dashed" color="blue"
fontcolor="black" ]
"group_1:postfix_9_monitor_120000 paul" [ style=bold color="green"
fontcolor="black" ]
"group_1:postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ]
+"group_1:datadisk_1_monitor_0 paul" [ style="dashed" color="blue"
fontcolor="black" ]
"group_1:datadisk_1_monitor_120000 paul" [ style="dashed" color="blue"
fontcolor="black" ]
"group_1:IPaddr_5_monitor_5000 paul" [ style="dashed" color="blue"
fontcolor="black" ]
"group_1:datadisk_1_stop_0 paul" [ style="dashed" color="blue"
fontcolor="black" ]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/994.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- 994.exp 26 Mar 2006 15:58:52 -0000 1.3
+++ 994.exp 31 Mar 2006 12:09:31 -0000 1.4
@@ -1,34 +1,34 @@
<transition_graph global_timeout="120s" transition_id="0">
<synapse id="0">
<action_set>
- <pseudo_event id="14" rsc_id="group_1" operation="start"
operation_key="group_1_start_0">
+ <pseudo_event id="15" rsc_id="group_1" operation="start"
operation_key="group_1_start_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="17" rsc_id="group_1" operation="stopped"
operation_key="group_1_stopped_0"/>
+ <pseudo_event id="18" rsc_id="group_1" operation="stopped"
operation_key="group_1_stopped_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="1">
<action_set>
- <pseudo_event id="15" rsc_id="group_1" operation="running"
operation_key="group_1_running_0">
+ <pseudo_event id="16" rsc_id="group_1" operation="running"
operation_key="group_1_running_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="13" rsc_id="group_1:postfix_9" operation="start"
operation_key="group_1:postfix_9_start_0" on_node="paul"
on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
+ <rsc_op id="14" rsc_id="group_1:postfix_9" operation="start"
operation_key="group_1:postfix_9_start_0" on_node="paul"
on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
</trigger>
<trigger>
- <pseudo_event id="14" rsc_id="group_1" operation="start"
operation_key="group_1_start_0"/>
+ <pseudo_event id="15" rsc_id="group_1" operation="start"
operation_key="group_1_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="2">
<action_set>
- <pseudo_event id="16" rsc_id="group_1" operation="stop"
operation_key="group_1_stop_0">
+ <pseudo_event id="17" rsc_id="group_1" operation="stop"
operation_key="group_1_stop_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
@@ -36,13 +36,13 @@
</synapse>
<synapse id="3">
<action_set>
- <pseudo_event id="17" rsc_id="group_1" operation="stopped"
operation_key="group_1_stopped_0">
+ <pseudo_event id="18" rsc_id="group_1" operation="stopped"
operation_key="group_1_stopped_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="16" rsc_id="group_1" operation="stop"
operation_key="group_1_stop_0"/>
+ <pseudo_event id="17" rsc_id="group_1" operation="stop"
operation_key="group_1_stop_0"/>
</trigger>
</inputs>
</synapse>
@@ -55,7 +55,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="13" rsc_id="group_1:postfix_9" operation="start"
operation_key="group_1:postfix_9_start_0" on_node="paul"
on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
+ <rsc_op id="14" rsc_id="group_1:postfix_9" operation="start"
operation_key="group_1:postfix_9_start_0" on_node="paul"
on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
</trigger>
</inputs>
</synapse>
@@ -68,13 +68,13 @@
</action_set>
<inputs>
<trigger>
- <pseudo_event id="16" rsc_id="group_1" operation="stop"
operation_key="group_1_stop_0"/>
+ <pseudo_event id="17" rsc_id="group_1" operation="stop"
operation_key="group_1_stop_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="6">
<action_set>
- <rsc_op id="13" rsc_id="group_1:postfix_9" operation="start"
operation_key="group_1:postfix_9_start_0" on_node="paul"
on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
+ <rsc_op id="14" rsc_id="group_1:postfix_9" operation="start"
operation_key="group_1:postfix_9_start_0" on_node="paul"
on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
<primitive class="lsb" id="group_1:postfix_9" provider="heartbeat"
type="postfix"/>
<attributes crm_feature_set="1.0.4"/>
</rsc_op>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/group10.dot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- group10.dot 22 Dec 2005 21:05:28 -0000 1.1
+++ group10.dot 31 Mar 2006 12:09:31 -0000 1.2
@@ -11,18 +11,19 @@
"group-1:child_192.168.100.182_monitor_5000 c001n01" [ style=bold
color="green" fontcolor="black" ]
"rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue"
fontcolor="black" ]
"group-1:child_192.168.100.183_monitor_5000 c001n01" [ style=bold
color="green" fontcolor="black" ]
+"group-1:child_192.168.100.181_monitor_5000 c001n01" [ style=bold
color="green" fontcolor="black" ]
+"group-1:child_192.168.100.181_stop_0 c001n01" [ style=bold color="green"
fontcolor="black" ]
"DcIPaddr_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
"DcIPaddr_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
"group-1:child_192.168.100.181_start_0 c001n01" [ style=bold color="green"
fontcolor="black" ]
-"group-1:child_192.168.100.181_monitor_5000 c001n01" [ style=bold
color="green" fontcolor="black" ]
"group-1:child_192.168.100.182_stop_0 c001n01" [ style=bold color="green"
fontcolor="black" ]
"group-1:child_192.168.100.182_start_0 c001n01" [ style=bold color="green"
fontcolor="black" ]
"group-1:child_192.168.100.183_stop_0 c001n01" [ style=bold color="green"
fontcolor="black" ]
"group-1:child_192.168.100.183_start_0 c001n01" [ style=bold color="green"
fontcolor="black" ]
"group-1_start_0" [ style=bold color="green" fontcolor="orange" ]
"group-1_running_0" [ style=bold color="green" fontcolor="orange" ]
-"group-1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"group-1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
+"group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"rsc_c001n08_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n08_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
@@ -54,19 +55,22 @@
"group-1:child_192.168.100.182_start_0 c001n01" ->
"group-1:child_192.168.100.182_monitor_5000 c001n01" [ style = bold]
"rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style =
dashed]
"group-1:child_192.168.100.183_start_0 c001n01" ->
"group-1:child_192.168.100.183_monitor_5000 c001n01" [ style = bold]
+"group-1:child_192.168.100.181_start_0 c001n01" ->
"group-1:child_192.168.100.181_monitor_5000 c001n01" [ style = bold]
+"group-1:child_192.168.100.182_stop_0 c001n01" ->
"group-1:child_192.168.100.181_stop_0 c001n01" [ style = bold]
"DcIPaddr_stop_0 c001n08" -> "DcIPaddr_start_0 c001n08" [ style = dashed]
+"group-1:child_192.168.100.181_stop_0 c001n01" ->
"group-1:child_192.168.100.181_start_0 c001n01" [ style = bold]
"group-1_start_0" -> "group-1:child_192.168.100.181_start_0 c001n01" [ style =
bold]
-"group-1:child_192.168.100.181_start_0 c001n01" ->
"group-1:child_192.168.100.181_monitor_5000 c001n01" [ style = bold]
"group-1:child_192.168.100.183_stop_0 c001n01" ->
"group-1:child_192.168.100.182_stop_0 c001n01" [ style = bold]
"group-1:child_192.168.100.181_start_0 c001n01" ->
"group-1:child_192.168.100.182_start_0 c001n01" [ style = bold]
"group-1:child_192.168.100.182_stop_0 c001n01" ->
"group-1:child_192.168.100.182_start_0 c001n01" [ style = bold]
-"group-1_stop_0" -> "group-1:child_192.168.100.183_stop_0 c001n01" [ style =
dashed]
+"group-1_stop_0" -> "group-1:child_192.168.100.183_stop_0 c001n01" [ style =
bold]
"group-1:child_192.168.100.182_start_0 c001n01" ->
"group-1:child_192.168.100.183_start_0 c001n01" [ style = bold]
"group-1:child_192.168.100.183_stop_0 c001n01" ->
"group-1:child_192.168.100.183_start_0 c001n01" [ style = bold]
-"group-1_stopped_0" -> "group-1_start_0" [ style = dashed]
+"group-1_stopped_0" -> "group-1_start_0" [ style = bold]
"group-1:child_192.168.100.183_start_0 c001n01" -> "group-1_running_0" [ style
= bold]
"group-1_start_0" -> "group-1_running_0" [ style = bold]
-"group-1_stop_0" -> "group-1_stopped_0" [ style = dashed]
+"group-1:child_192.168.100.181_stop_0 c001n01" -> "group-1_stopped_0" [ style
= bold]
+"group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/group10.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- group10.exp 8 Mar 2006 15:51:36 -0000 1.2
+++ group10.exp 31 Mar 2006 12:09:31 -0000 1.3
@@ -1,54 +1,97 @@
<transition_graph global_timeout="3m" transition_id="0">
<synapse id="0">
<action_set>
- <pseudo_event id="20" rsc_id="group-1" operation="start"
operation_key="group-1_start_0">
+ <pseudo_event id="21" rsc_id="group-1" operation="start"
operation_key="group-1_start_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
- <inputs/>
+ <inputs>
+ <trigger>
+ <pseudo_event id="24" rsc_id="group-1" operation="stopped"
operation_key="group-1_stopped_0"/>
+ </trigger>
+ </inputs>
</synapse>
<synapse id="1">
<action_set>
- <pseudo_event id="21" rsc_id="group-1" operation="running"
operation_key="group-1_running_0">
+ <pseudo_event id="22" rsc_id="group-1" operation="running"
operation_key="group-1_running_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" rsc_id="group-1:child_192.168.100.183"
operation="start" operation_key="group-1:child_192.168.100.183_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="20" rsc_id="group-1:child_192.168.100.183"
operation="start" operation_key="group-1:child_192.168.100.183_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <pseudo_event id="20" rsc_id="group-1" operation="start"
operation_key="group-1_start_0"/>
+ <pseudo_event id="21" rsc_id="group-1" operation="start"
operation_key="group-1_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="2">
<action_set>
- <rsc_op id="14" rsc_id="group-1:child_192.168.100.181"
operation="start" operation_key="group-1:child_192.168.100.181_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <pseudo_event id="23" rsc_id="group-1" operation="stop"
operation_key="group-1_stop_0">
+ <attributes crm_feature_set="1.0.4"/>
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <pseudo_event id="24" rsc_id="group-1" operation="stopped"
operation_key="group-1_stopped_0">
+ <attributes crm_feature_set="1.0.4"/>
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="13" rsc_id="group-1:child_192.168.100.181"
operation="stop" operation_key="group-1:child_192.168.100.181_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="23" rsc_id="group-1" operation="stop"
operation_key="group-1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <rsc_op id="12" rsc_id="group-1:child_192.168.100.181"
operation="monitor" operation_key="group-1:child_192.168.100.181_monitor_5000"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <primitive id="group-1:child_192.168.100.181" class="ocf"
type="IPaddr" provider="heartbeat"/>
+ <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000"
ip="192.168.100.181"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="16" rsc_id="group-1:child_192.168.100.181"
operation="start" operation_key="group-1:child_192.168.100.181_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <rsc_op id="13" rsc_id="group-1:child_192.168.100.181" operation="stop"
operation_key="group-1:child_192.168.100.181_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.181" class="ocf"
type="IPaddr" provider="heartbeat"/>
<attributes crm_feature_set="1.0.4" ip="192.168.100.181"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="20" rsc_id="group-1" operation="start"
operation_key="group-1_start_0"/>
+ <rsc_op id="17" rsc_id="group-1:child_192.168.100.182"
operation="stop" operation_key="group-1:child_192.168.100.182_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="6">
<action_set>
- <rsc_op id="15" rsc_id="group-1:child_192.168.100.181"
operation="monitor" operation_key="group-1:child_192.168.100.181_monitor_5000"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="16" rsc_id="group-1:child_192.168.100.181"
operation="start" operation_key="group-1:child_192.168.100.181_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.181" class="ocf"
type="IPaddr" provider="heartbeat"/>
- <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000"
ip="192.168.100.181"/>
+ <attributes crm_feature_set="1.0.4" ip="192.168.100.181"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="14" rsc_id="group-1:child_192.168.100.181"
operation="start" operation_key="group-1:child_192.168.100.181_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="13" rsc_id="group-1:child_192.168.100.181"
operation="stop" operation_key="group-1:child_192.168.100.181_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="21" rsc_id="group-1" operation="start"
operation_key="group-1_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="4">
+ <synapse id="7">
<action_set>
<rsc_op id="9" rsc_id="group-1:child_192.168.100.182"
operation="monitor" operation_key="group-1:child_192.168.100.182_monitor_5000"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.182" class="ocf"
type="IPaddr" provider="heartbeat"/>
@@ -57,40 +100,40 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="17" rsc_id="group-1:child_192.168.100.182"
operation="start" operation_key="group-1:child_192.168.100.182_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="18" rsc_id="group-1:child_192.168.100.182"
operation="start" operation_key="group-1:child_192.168.100.182_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
- <synapse id="5">
+ <synapse id="8">
<action_set>
- <rsc_op id="16" rsc_id="group-1:child_192.168.100.182" operation="stop"
operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="stop"
operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.182" class="ocf"
type="IPaddr" provider="heartbeat"/>
<attributes crm_feature_set="1.0.4" ip="192.168.100.182"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="18" rsc_id="group-1:child_192.168.100.183"
operation="stop" operation_key="group-1:child_192.168.100.183_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="19" rsc_id="group-1:child_192.168.100.183"
operation="stop" operation_key="group-1:child_192.168.100.183_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
- <synapse id="6">
+ <synapse id="9">
<action_set>
- <rsc_op id="17" rsc_id="group-1:child_192.168.100.182"
operation="start" operation_key="group-1:child_192.168.100.182_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="18" rsc_id="group-1:child_192.168.100.182"
operation="start" operation_key="group-1:child_192.168.100.182_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.182" class="ocf"
type="IPaddr" provider="heartbeat"/>
<attributes crm_feature_set="1.0.4" ip="192.168.100.182"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="14" rsc_id="group-1:child_192.168.100.181"
operation="start" operation_key="group-1:child_192.168.100.181_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="16" rsc_id="group-1:child_192.168.100.181"
operation="start" operation_key="group-1:child_192.168.100.181_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="16" rsc_id="group-1:child_192.168.100.182"
operation="stop" operation_key="group-1:child_192.168.100.182_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="17" rsc_id="group-1:child_192.168.100.182"
operation="stop" operation_key="group-1:child_192.168.100.182_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
- <synapse id="7">
+ <synapse id="10">
<action_set>
<rsc_op id="11" rsc_id="group-1:child_192.168.100.183"
operation="monitor" operation_key="group-1:child_192.168.100.183_monitor_5000"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.183" class="ocf"
type="IPaddr" provider="heartbeat"/>
@@ -99,32 +142,36 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" rsc_id="group-1:child_192.168.100.183"
operation="start" operation_key="group-1:child_192.168.100.183_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="20" rsc_id="group-1:child_192.168.100.183"
operation="start" operation_key="group-1:child_192.168.100.183_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
- <synapse id="8">
+ <synapse id="11">
<action_set>
- <rsc_op id="18" rsc_id="group-1:child_192.168.100.183" operation="stop"
operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="stop"
operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.183" class="ocf"
type="IPaddr" provider="heartbeat"/>
<attributes crm_feature_set="1.0.4" ip="192.168.100.183"/>
</rsc_op>
</action_set>
- <inputs/>
+ <inputs>
+ <trigger>
+ <pseudo_event id="23" rsc_id="group-1" operation="stop"
operation_key="group-1_stop_0"/>
+ </trigger>
+ </inputs>
</synapse>
- <synapse id="9">
+ <synapse id="12">
<action_set>
- <rsc_op id="19" rsc_id="group-1:child_192.168.100.183"
operation="start" operation_key="group-1:child_192.168.100.183_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="20" rsc_id="group-1:child_192.168.100.183"
operation="start" operation_key="group-1:child_192.168.100.183_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="group-1:child_192.168.100.183" class="ocf"
type="IPaddr" provider="heartbeat"/>
<attributes crm_feature_set="1.0.4" ip="192.168.100.183"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="17" rsc_id="group-1:child_192.168.100.182"
operation="start" operation_key="group-1:child_192.168.100.182_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="18" rsc_id="group-1:child_192.168.100.182"
operation="start" operation_key="group-1:child_192.168.100.182_start_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="18" rsc_id="group-1:child_192.168.100.183"
operation="stop" operation_key="group-1:child_192.168.100.183_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="19" rsc_id="group-1:child_192.168.100.183"
operation="stop" operation_key="group-1:child_192.168.100.183_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
</inputs>
</synapse>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-6.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- master-6.xml 29 Mar 2006 15:56:02 -0000 1.2
+++ master-6.xml 31 Mar 2006 12:09:31 -0000 1.3
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<!DOCTYPE cib SYSTEM "crm-1.0.dtd">
<cib cib_feature_revision="1" have_quorum="true" generated="true"
admin_epoch="0" ccm_transition="4" num_peers="4" crm_feature_set="1.0.4"
debug_source="create_node_entry" dc_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"
epoch="4" num_updates="167">
<configuration>
<crm_config>
@@ -259,7 +257,7 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0"
operation="monitor" origin="build_active_RAs"
transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
- <parameters c_1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
+ <parameters 1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:0"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
@@ -269,7 +267,7 @@
<lrm_rsc_op id="ocf_msdummy:0_promote_0" operation="promote"
origin="do_update_resource"
transition_key="15:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="0:0;15:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="complete" call_id="48" rc_code="0" op_status="0">
<parameters clone="0" clone_max="8"
logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4"
master_node_max="1" clone_node_max="2"/>
</lrm_rsc_op>
- <lrm_rsc_op id="ocf_msdummy:0_monitor_6000" operation="monitor"
origin="do_update_resource"
transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:8;14:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="47" rc_code="8" op_status="4">
+ <lrm_rsc_op id="ocf_msdummy:0_monitor_6000" operation="monitor"
origin="do_update_resource"
transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:8;14:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="49" rc_code="8" op_status="4">
<parameters clone="0" clone_max="8" timeout="10000"
logfile="/var/log/cts_ocfdummy.log" te-target-rc="8" crm_feature_set="1.0.4"
interval="6000" master_max="4" master_node_max="1" clone_node_max="2"/>
</lrm_rsc_op>
<lrm_rsc_op id="ocf_msdummy:0_stop_0" operation="stop"
origin="do_update_resource"
transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="0:0;14:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="stopped" call_id="45" rc_code="0" op_status="0"/>
@@ -380,10 +378,10 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_start_0"
operation="start" origin="build_active_RAs"
transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="running" call_id="31" rc_code="0" op_status="0">
- <parameters c_1="192.168.100.182" crm_feature_set="1.0.4"/>
+ <parameters 1="192.168.100.182" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_5000"
operation="monitor" origin="build_active_RAs"
transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="running" call_id="35" rc_code="0" op_status="0">
- <parameters timeout="20000" c_1="192.168.100.182"
crm_feature_set="1.0.4" interval="5000"/>
+ <parameters timeout="20000" 1="192.168.100.182"
crm_feature_set="1.0.4" interval="5000"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:0"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
@@ -489,7 +487,7 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0"
operation="monitor" origin="build_active_RAs"
transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
- <parameters c_1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
+ <parameters 1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:0"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
@@ -571,7 +569,7 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0"
operation="monitor" origin="do_update_resource"
transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
- <parameters c_1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
+ <parameters 1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:1"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-10.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- rec-node-10.xml 7 Oct 2005 15:57:35 -0000 1.8
+++ rec-node-10.xml 31 Mar 2006 12:09:31 -0000 1.9
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-11.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- rec-node-11.xml 19 Oct 2005 08:28:47 -0000 1.1
+++ rec-node-11.xml 31 Mar 2006 12:09:31 -0000 1.2
@@ -26,7 +26,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="group1:rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="group1:rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="group1:rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="group1:rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="group1:rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-3.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-3.xml 7 Oct 2005 15:57:35 -0000 1.7
+++ rec-node-3.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-4.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-4.xml 7 Oct 2005 15:57:35 -0000 1.7
+++ rec-node-4.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-5.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-5.xml 7 Oct 2005 15:57:35 -0000 1.7
+++ rec-node-5.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-6.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-6.xml 7 Oct 2005 15:57:35 -0000 1.7
+++ rec-node-6.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-7.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-7.xml 7 Oct 2005 15:57:35 -0000 1.7
+++ rec-node-7.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-8.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-8.xml 7 Oct 2005 15:57:36 -0000 1.7
+++ rec-node-8.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -22,7 +22,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-9.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-9.xml 7 Oct 2005 15:57:36 -0000 1.7
+++ rec-node-9.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -21,7 +21,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" last_op="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" last_op="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" last_op="start" rsc_state="running"
op_status="0" rc_code="0" call_id="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-rsc-3.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-rsc-3.xml 7 Oct 2005 15:57:36 -0000 1.7
+++ rec-rsc-3.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -20,7 +20,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
</lrm_resources>
</lrm>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-rsc-4.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-rsc-4.xml 7 Oct 2005 15:57:36 -0000 1.7
+++ rec-rsc-4.xml 31 Mar 2006 12:09:31 -0000 1.8
@@ -20,7 +20,7 @@
<lrm>
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
</lrm_resource>
</lrm_resources>
</lrm>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-rsc-5.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- rec-rsc-5.xml 7 Oct 2005 15:57:36 -0000 1.8
+++ rec-rsc-5.xml 31 Mar 2006 12:09:31 -0000 1.9
@@ -23,7 +23,7 @@
<lrm_resources>
<lrm_resource id="rsc1" class="heartbeat" type="apache">
<!--lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/-->
- <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="7" call_id="2"/>
+ <lrm_rsc_op id="rsc1_stop_0" operation="stop"
rsc_state="stop_failed" op_status="4" rc_code="6" call_id="2"/>
</lrm_resource>
<lrm_resource id="rsc2" class="heartbeat" type="apache">
<lrm_rsc_op id="rsc2_start_0" operation="start"
rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
------------------------------
_______________________________________________
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 90
********************************************
