Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Jun 2006 07:32:59 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
group.c
Log Message:
Stonith constraints need to be calculated against the members of the group,
not the group itself
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- group.c 13 Jun 2006 13:08:07 -0000 1.66
+++ group.c 22 Jun 2006 13:32:58 -0000 1.67
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.66 2006/06/13 13:08:07 andrew Exp $ */
+/* $Id: group.c,v 1.67 2006/06/22 13:32:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -460,8 +460,6 @@
group_stonith_ordering(
resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set)
{
-#if 0
- /* I dont think it is a good idea to be poking inside groups */
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
@@ -471,6 +469,6 @@
child_rsc->cmds->stonith_ordering(
child_rsc, stonith_op, data_set);
);
-#endif
- native_stonith_ordering(rsc, stonith_op, data_set);
}
+
+
------------------------------
Message: 2
Date: Thu, 22 Jun 2006 07:33:34 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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
Log Message:
Only complain about unprotected resources once per resource
------------------------------
Message: 3
Date: Thu, 22 Jun 2006 07:34:10 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/pengine
Modified Files:
utils.c
Log Message:
Detect invalid prereq's for stonith resources
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- utils.c 21 Jun 2006 11:06:13 -0000 1.6
+++ utils.c 22 Jun 2006 13:34:10 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.6 2006/06/21 11:06:13 andrew Exp $ */
+/* $Id: utils.c,v 1.7 2006/06/22 13:34:10 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -540,6 +540,7 @@
action_t *action, crm_data_t *xml_obj, pe_working_set_t* data_set)
{
int lpc = 0;
+ const char *class = NULL;
const char *value = NULL;
const char *fields[] = {
XML_LRM_ATTR_INTERVAL,
@@ -584,6 +585,16 @@
action->needs = rsc_req_quorum;
value = "quorum (default)";
}
+
+ class = g_hash_table_lookup(action->rsc->meta, "class");
+ if(safe_str_eq(class, "stonith")) {
+ if(action->needs == rsc_req_stonith) {
+ pe_config_err("Stonith resources (eg. %s) cannot
require"
+ " fencing to start", action->rsc->id);
+ }
+ action->needs = rsc_req_nothing;
+ value = "nothing (fencing override)";
+ }
crm_debug_3("\tAction %s requires: %s", action->task, value);
value = NULL;
@@ -712,15 +723,6 @@
action->meta, crm_strdup(fields[lpc]), tmp_ms);
}
}
-
-/* if(safe_str_eq(native_data->agent->class, "stonith")) { */
-/* if(rsc->start_needs == rsc_req_stonith) { */
-/* pe_err("Stonith resources (eg. %s) cannot require" */
-/* " fencing to start", rsc->id); */
-/* } */
-/* rsc->start_needs = rsc_req_quorum; */
-/* } */
-
}
crm_data_t *
------------------------------
Message: 4
Date: Thu, 22 Jun 2006 07:47:03 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
quorum-5.exp quorum-5.xml rec-node-2.dot rec-node-2.exp
rec-node-2.xml
Log Message:
Update a bunch of tests to DTD-valid state
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/quorum-5.exp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- quorum-5.exp 26 May 2006 14:54:00 -0000 1.17
+++ quorum-5.exp 22 Jun 2006 13:47:03 -0000 1.18
@@ -39,7 +39,7 @@
<action_set>
<rsc_op id="5" operation="start"
operation_key="child_DoFencing_1_start_0" on_node="hadev2"
on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1"
class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 "/>
+ <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 "
CRM_meta_id="0" CRM_meta_timeout="120000" CRM_meta_name="start"
CRM_meta_prereq="nothing"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/quorum-5.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- quorum-5.xml 20 Jun 2006 20:04:43 -0000 1.6
+++ quorum-5.xml 22 Jun 2006 13:47:03 -0000 1.7
@@ -13,9 +13,10 @@
<node id="879e65f8-4b38-4c56-9552-4752ad436669" uname="hadev3"
type="member"/>
</nodes>
<resources>
- <group id="group1" start_prereq="nothing">
+ <group id="group1">
<primitive id="child_DoFencing_1" class="stonith" type="ssh">
<operations>
+ <op id="0" name="start" prereq="nothing"/>
<op id="1" name="monitor" interval="5s" timeout="20s"/>
</operations>
<instance_attributes>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-2.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-2.dot 5 May 2006 13:08:55 -0000 1.7
+++ rec-node-2.dot 22 Jun 2006 13:47:03 -0000 1.8
@@ -42,11 +42,11 @@
"group1_start_0" -> "group1_running_0" [ style = bold]
"group1_stop_0" -> "group1_stopped_0" [ style = dashed]
"group2_start_0" -> "rsc5_start_0 node2" [ style = bold]
+"stonith node1" -> "rsc5_start_0 node2" [ style = bold]
"rsc5_start_0 node2" -> "rsc6_start_0 node2" [ style = bold]
"probe_complete" -> "group2_start_0" [ style = bold]
"group2_stop_0" -> "group2_start_0" [ style = dashed]
"group2_stopped_0" -> "group2_start_0" [ style = dashed]
-"stonith node1" -> "group2_start_0" [ style = bold]
"rsc6_start_0 node2" -> "group2_running_0" [ style = bold]
"group2_start_0" -> "group2_running_0" [ style = bold]
"group2_stop_0" -> "group2_stopped_0" [ style = dashed]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-2.exp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- rec-node-2.exp 20 Jun 2006 20:04:44 -0000 1.24
+++ rec-node-2.exp 22 Jun 2006 13:47:03 -0000 1.25
@@ -49,7 +49,7 @@
<synapse id="4">
<action_set>
<pseudo_event id="13" operation="start" operation_key="group1_start_0">
- <attributes crm_feature_set="1.0.6" CRM_meta_id="1"
CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
+ <attributes crm_feature_set="1.0.6"/>
</pseudo_event>
</action_set>
<inputs>
@@ -86,7 +86,7 @@
<action_set>
<rsc_op id="11" operation="start" operation_key="rsc3_start_0"
on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc3" long-id="group1:rsc3" class="heartbeat"
type="apache"/>
- <attributes crm_feature_set="1.0.6"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_id="1"
CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
</rsc_op>
</action_set>
<inputs>
@@ -120,16 +120,13 @@
<synapse id="10">
<action_set>
<pseudo_event id="19" operation="start" operation_key="group2_start_0">
- <attributes crm_feature_set="1.0.6" CRM_meta_id="2"
CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
+ <attributes crm_feature_set="1.0.6"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
<pseudo_event id="1" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
- <trigger>
- <crm_event id="23" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
</inputs>
</synapse>
<synapse id="11">
@@ -160,13 +157,16 @@
<action_set>
<rsc_op id="17" operation="start" operation_key="rsc5_start_0"
on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc5" long-id="group2:rsc5" class="heartbeat"
type="apache"/>
- <attributes crm_feature_set="1.0.6"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_id="2"
CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
<pseudo_event id="19" operation="start"
operation_key="group2_start_0"/>
</trigger>
+ <trigger>
+ <crm_event id="23" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="14" priority="1000000">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-2.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- rec-node-2.xml 20 Jun 2006 20:04:44 -0000 1.8
+++ rec-node-2.xml 22 Jun 2006 13:47:03 -0000 1.9
@@ -24,17 +24,19 @@
</operations>
</primitive>
<group id="group1">
- <operations>
- <op id="1" name="start" prereq="quorum"/>
- </operations>
- <primitive id="rsc3" class="heartbeat" type="apache"/>
+ <primitive id="rsc3" class="heartbeat" type="apache">
+ <operations>
+ <op id="1" name="start" prereq="quorum"/>
+ </operations>
+ </primitive>
<primitive id="rsc4" class="heartbeat" type="apache"/>
</group>
<group id="group2">
- <operations>
- <op id="2" name="start" prereq="fencing"/>
- </operations>
- <primitive id="rsc5" class="heartbeat" type="apache"/>
+ <primitive id="rsc5" class="heartbeat" type="apache">
+ <operations>
+ <op id="2" name="start" prereq="fencing"/>
+ </operations>
+ </primitive>
<primitive id="rsc6" class="heartbeat" type="apache"/>
</group>
</resources>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 83
********************************************
