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: Mon, 27 Mar 2006 08:53:11 -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:
master-4.dot master-4.exp master-4.xml
Added Files:
master-5.dot master-5.exp master-5.xml master-6.dot
master-6.exp master-6.xml
Log Message:
Master/slave is now tested and apparently works
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-4.dot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- master-4.dot 27 Mar 2006 10:03:55 -0000 1.1
+++ master-4.dot 27 Mar 2006 15:53:10 -0000 1.2
@@ -3,7 +3,7 @@
"rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
"ocf_msdummy:3_monitor_5000 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
"child_DoFencing:0_monitor_20000 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
-"ocf_msdummy:0_monitor_5000 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
+"ocf_msdummy:0_monitor_5000 c001n08" [ style=bold color="green"
fontcolor="black" ]
"DcIPaddr_monitor_5000 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
"ocf_msdummy:4_monitor_5000 c001n03" [ style="dashed" color="blue"
fontcolor="black" ]
"heartbeat_child_monitor_5000 c001n03" [ style="dashed" color="blue"
fontcolor="black" ]
@@ -56,6 +56,7 @@
"ocf_msdummy:0_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black"
]
"ocf_msdummy:0_start_0 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
"ocf_msdummy:0_promote_0 c001n08" [ style=bold color="green" fontcolor="black"
]
+"ocf_msdummy:0_monitor_6000 c001n08" [ style=bold color="green"
fontcolor="black" ]
"ocf_msdummy:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black"
]
"ocf_msdummy:1_start_0 c001n03" [ style="dashed" color="blue"
fontcolor="black" ]
"ocf_msdummy:2_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black"
]
@@ -81,7 +82,6 @@
"rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style =
dashed]
"ocf_msdummy:3_start_0 c001n08" -> "ocf_msdummy:3_monitor_5000 c001n08" [
style = dashed]
"child_DoFencing:0_start_0 c001n08" -> "child_DoFencing:0_monitor_20000
c001n08" [ style = dashed]
-"ocf_msdummy:0_start_0 c001n08" -> "ocf_msdummy:0_monitor_5000 c001n08" [
style = dashed]
"DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = dashed]
"ocf_msdummy:4_start_0 c001n03" -> "ocf_msdummy:4_monitor_5000 c001n03" [
style = dashed]
"heartbeat_child_start_0 c001n03" -> "heartbeat_child_monitor_5000 c001n03" [
style = dashed]
@@ -141,7 +141,10 @@
"master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n08" [ style = dashed]
"ocf_msdummy:0_stop_0 c001n08" -> "ocf_msdummy:0_start_0 c001n08" [ style =
dashed]
"master_rsc_1_start_0" -> "ocf_msdummy:0_start_0 c001n08" [ style = dashed]
+"ocf_msdummy:0_monitor_5000 c001n08" -> "ocf_msdummy:0_promote_0 c001n08" [
style = bold]
"master_rsc_1_promote_0" -> "ocf_msdummy:0_promote_0 c001n08" [ style = bold]
+"ocf_msdummy:0_start_0 c001n08" -> "ocf_msdummy:0_monitor_6000 c001n08" [
style = dashed]
+"ocf_msdummy:0_promote_0 c001n08" -> "ocf_msdummy:0_monitor_6000 c001n08" [
style = bold]
"master_rsc_1_stop_0" -> "ocf_msdummy:1_stop_0 c001n03" [ style = dashed]
"ocf_msdummy:1_stop_0 c001n03" -> "ocf_msdummy:1_start_0 c001n03" [ style =
dashed]
"master_rsc_1_start_0" -> "ocf_msdummy:1_start_0 c001n03" [ style = dashed]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-4.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- master-4.exp 27 Mar 2006 10:03:55 -0000 1.1
+++ master-4.exp 27 Mar 2006 15:53:10 -0000 1.2
@@ -1,6 +1,15 @@
<transition_graph global_timeout="3m" transition_id="0">
<synapse id="0" priority="1000">
<action_set>
+ <rsc_op id="4" rsc_id="ocf_msdummy:0" operation="cancel"
operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <primitive id="ocf_msdummy:0" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat"/>
+ <attributes timeout="10000" crm_feature_set="1.0.4" interval="5000"
task="monitor" clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log"
master_max="4" master_node_max="1" clone_node_max="2"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="1" priority="1000">
+ <action_set>
<rsc_op id="56" rsc_id="ocf_msdummy:0" operation="promote"
operation_key="ocf_msdummy:0_promote_0" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<primitive id="ocf_msdummy:0" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat"/>
<attributes crm_feature_set="1.0.4" clone="0" clone_max="8"
logfile="/var/log/cts_ocfdummy.log" master_max="4" master_node_max="1"
clone_node_max="2"/>
@@ -8,21 +17,37 @@
</action_set>
<inputs>
<trigger>
- <pseudo_event id="75" rsc_id="master_rsc_1" operation="promote"
operation_key="master_rsc_1_promote_0"/>
+ <rsc_op id="4" rsc_id="ocf_msdummy:0" operation="cancel"
operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="76" rsc_id="master_rsc_1" operation="promote"
operation_key="master_rsc_1_promote_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2" priority="1000">
+ <action_set>
+ <rsc_op id="57" rsc_id="ocf_msdummy:0" operation="monitor"
operation_key="ocf_msdummy:0_monitor_6000" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <primitive id="ocf_msdummy:0" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat"/>
+ <attributes timeout="10000" te-target-rc="8" crm_feature_set="1.0.4"
interval="6000" clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log"
master_max="4" master_node_max="1" clone_node_max="2"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="56" rsc_id="ocf_msdummy:0" operation="promote"
operation_key="ocf_msdummy:0_promote_0" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
- <synapse id="1">
+ <synapse id="3">
<action_set>
- <pseudo_event id="75" rsc_id="master_rsc_1" operation="promote"
operation_key="master_rsc_1_promote_0">
+ <pseudo_event id="76" rsc_id="master_rsc_1" operation="promote"
operation_key="master_rsc_1_promote_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="4">
<action_set>
- <pseudo_event id="76" rsc_id="master_rsc_1" operation="promoted"
operation_key="master_rsc_1_promoted_0">
+ <pseudo_event id="77" rsc_id="master_rsc_1" operation="promoted"
operation_key="master_rsc_1_promoted_0">
<attributes crm_feature_set="1.0.4"/>
</pseudo_event>
</action_set>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- master-4.xml 27 Mar 2006 10:03:55 -0000 1.1
+++ master-4.xml 27 Mar 2006 15:53:10 -0000 1.2
@@ -138,6 +138,7 @@
<primitive id="ocf_msdummy" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat">
<operations>
<op id="ocf_msdummy_monitor" name="monitor" interval="5s"
timeout="10s"/>
+ <op id="ocf_msdummy_master_monitor" name="monitor" interval="6s"
timeout="10s" role="Master"/>
</operations>
<instance_attributes>
<attributes>
------------------------------
Message: 2
Date: Mon, 27 Mar 2006 08:54:18 -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/tengine
Modified Files:
events.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- events.c 18 Mar 2006 17:23:48 -0000 1.5
+++ events.c 27 Mar 2006 15:54:18 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.5 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: events.c,v 1.6 2006/03/27 15:54:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -281,9 +281,9 @@
case LRM_OP_TIMEOUT:
case LRM_OP_NOTSUPPORTED:
action->failed = TRUE;
- crm_warn("Action %s on %s failed (rc: %d vs. %d): %s",
- update_event, event_node, target_rc, op_rc_i,
- op_status2text(op_status_i));
+ crm_err("Action %s on %s failed (rc: %d vs. %d): %s",
+ update_event, event_node, target_rc, op_rc_i,
+ op_status2text(op_status_i));
break;
case LRM_OP_CANCELLED:
/* do nothing?? */
------------------------------
_______________________________________________
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 72
********************************************
