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: Thu, 1 Jun 2006 04:38:39 -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
Modified Files:
incarnation.c native.c
Log Message:
Novell #180303: Notification ordering
- order pre-start after post-stop
- order monitoring after *confirmed* post notifications
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- incarnation.c 30 May 2006 07:47:44 -0000 1.93
+++ incarnation.c 1 Jun 2006 10:38:39 -0000 1.94
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.93 2006/05/30 07:47:44 andrew Exp $ */
+/* $Id: incarnation.c,v 1.94 2006/06/01 10:38:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -471,7 +471,8 @@
{
gboolean child_starting = FALSE;
gboolean child_stopping = FALSE;
- action_t *action = NULL;
+ action_t *stop = NULL;
+ action_t *start = NULL;
action_t *action_complete = NULL;
resource_t *last_start_rsc = NULL;
resource_t *last_stop_rsc = NULL;
@@ -494,37 +495,42 @@
);
/* start */
- action = start_action(clone_data->self, NULL, !child_starting);
+ start = start_action(clone_data->self, NULL, !child_starting);
action_complete = custom_action(
clone_data->self, started_key(rsc),
CRMD_ACTION_STARTED, NULL, !child_starting, TRUE, data_set);
- action->pseudo = TRUE;
+ start->pseudo = TRUE;
action_complete->pseudo = TRUE;
action_complete->priority = INFINITY;
child_starting_constraints(clone_data, pe_ordering_optional,
NULL, last_start_rsc, data_set);
- clone_create_notifications(rsc, action, action_complete, data_set);
+ clone_create_notifications(
+ rsc, start, action_complete, data_set);
/* stop */
- action = stop_action(clone_data->self, NULL, !child_stopping);
+ stop = stop_action(clone_data->self, NULL, !child_stopping);
action_complete = custom_action(
clone_data->self, stopped_key(rsc),
CRMD_ACTION_STOPPED, NULL, !child_stopping, TRUE, data_set);
- action->pseudo = TRUE;
+ stop->pseudo = TRUE;
action_complete->pseudo = TRUE;
action_complete->priority = INFINITY;
child_stopping_constraints(clone_data, pe_ordering_optional,
NULL, last_stop_rsc, data_set);
- clone_create_notifications(rsc, action, action_complete, data_set);
-
+
+ clone_create_notifications(rsc, stop, action_complete, data_set);
rsc->actions = clone_data->self->actions;
+
+ if(stop->post_notified != NULL && start->pre_notify != NULL) {
+ order_actions(stop->post_notified, start->pre_notify,
pe_ordering_optional);
+ }
}
void
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- native.c 30 May 2006 08:54:32 -0000 1.145
+++ native.c 1 Jun 2006 10:38:39 -0000 1.146
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.145 2006/05/30 08:54:32 andrew Exp $ */
+/* $Id: native.c,v 1.146 2006/06/01 10:38:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1820,8 +1820,8 @@
notify->priority = INFINITY;
}
- if(op->post_notify != NULL) {
- notify = op->post_notify;
+ notify = op->post_notified;
+ if(notify != NULL) {
notify->priority = INFINITY;
slist_iter(
mon, action_t, rsc->actions, lpc,
------------------------------
Message: 2
Date: Thu, 1 Jun 2006 05:31:43 -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:
master-10.dot master-10.exp master-2.dot master-2.exp
notify-1.dot notify-1.exp notify-2.dot notify-2.exp
notify-3.dot notify-3.exp
Log Message:
Use new notification rules
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-10.dot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- master-10.dot 29 May 2006 10:09:05 -0000 1.3
+++ master-10.dot 1 Jun 2006 11:31:41 -0000 1.4
@@ -76,23 +76,23 @@
"rsc1_promote_0" -> "child_rsc1:2_promote_0 node1" [ style = bold]
"child_rsc1:2_start_0 node1" -> "child_rsc1:2_monitor_11000 node1" [ style =
bold]
"child_rsc1:2_promote_0 node1" -> "child_rsc1:2_monitor_11000 node1" [ style =
bold]
-"rsc1_post_notify_start_0" -> "child_rsc1:2_monitor_11000 node1" [ style =
bold]
-"rsc1_post_notify_promote_0" -> "child_rsc1:2_monitor_11000 node1" [ style =
bold]
+"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:2_monitor_11000 node1" [
style = bold]
+"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:2_monitor_11000 node1" [
style = bold]
"rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold]
"child_rsc1:3_start_0 node2" -> "child_rsc1:3_promote_0 node2" [ style = bold]
"rsc1_promote_0" -> "child_rsc1:3_promote_0 node2" [ style = bold]
"child_rsc1:3_start_0 node2" -> "child_rsc1:3_monitor_11000 node2" [ style =
bold]
"child_rsc1:3_promote_0 node2" -> "child_rsc1:3_monitor_11000 node2" [ style =
bold]
-"rsc1_post_notify_start_0" -> "child_rsc1:3_monitor_11000 node2" [ style =
bold]
-"rsc1_post_notify_promote_0" -> "child_rsc1:3_monitor_11000 node2" [ style =
bold]
+"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:3_monitor_11000 node2" [
style = bold]
+"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:3_monitor_11000 node2" [
style = bold]
"rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = bold]
"child_rsc1:0_start_0 node1" -> "child_rsc1:0_monitor_1000 node1" [ style =
bold]
-"rsc1_post_notify_start_0" -> "child_rsc1:0_monitor_1000 node1" [ style = bold]
-"rsc1_post_notify_promote_0" -> "child_rsc1:0_monitor_1000 node1" [ style =
bold]
+"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:0_monitor_1000 node1" [
style = bold]
+"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:0_monitor_1000 node1" [
style = bold]
"rsc1_start_0" -> "child_rsc1:1_start_0 node2" [ style = bold]
"child_rsc1:1_start_0 node2" -> "child_rsc1:1_monitor_1000 node2" [ style =
bold]
-"rsc1_post_notify_start_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold]
-"rsc1_post_notify_promote_0" -> "child_rsc1:1_monitor_1000 node2" [ style =
bold]
+"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:1_monitor_1000 node2" [
style = bold]
+"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:1_monitor_1000 node2" [
style = bold]
"probe_complete" -> "rsc1_start_0" [ style = bold]
"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
@@ -104,6 +104,7 @@
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold]
"child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style =
dashed]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style =
bold]
"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style =
bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-10.exp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- master-10.exp 29 May 2006 10:09:05 -0000 1.5
+++ master-10.exp 1 Jun 2006 11:31:41 -0000 1.6
@@ -61,10 +61,10 @@
<rsc_op id="15" operation="promote"
operation_key="child_rsc1:2_promote_0" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <pseudo_event id="28" operation="notify"
operation_key="rsc1_post_notify_start_0"/>
+ <pseudo_event id="29" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0"/>
</trigger>
<trigger>
- <pseudo_event id="40" operation="notify"
operation_key="rsc1_post_notify_promote_0"/>
+ <pseudo_event id="41" operation="notified"
operation_key="rsc1_confirmed-post_notify_promote_0"/>
</trigger>
</inputs>
</synapse>
@@ -169,10 +169,10 @@
<rsc_op id="18" operation="promote"
operation_key="child_rsc1:3_promote_0" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
<trigger>
- <pseudo_event id="28" operation="notify"
operation_key="rsc1_post_notify_start_0"/>
+ <pseudo_event id="29" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0"/>
</trigger>
<trigger>
- <pseudo_event id="40" operation="notify"
operation_key="rsc1_post_notify_promote_0"/>
+ <pseudo_event id="41" operation="notified"
operation_key="rsc1_confirmed-post_notify_promote_0"/>
</trigger>
</inputs>
</synapse>
@@ -258,10 +258,10 @@
<rsc_op id="20" operation="start"
operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <pseudo_event id="28" operation="notify"
operation_key="rsc1_post_notify_start_0"/>
+ <pseudo_event id="29" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0"/>
</trigger>
<trigger>
- <pseudo_event id="40" operation="notify"
operation_key="rsc1_post_notify_promote_0"/>
+ <pseudo_event id="41" operation="notified"
operation_key="rsc1_confirmed-post_notify_promote_0"/>
</trigger>
</inputs>
</synapse>
@@ -347,10 +347,10 @@
<rsc_op id="22" operation="start"
operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
<trigger>
- <pseudo_event id="28" operation="notify"
operation_key="rsc1_post_notify_start_0"/>
+ <pseudo_event id="29" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0"/>
</trigger>
<trigger>
- <pseudo_event id="40" operation="notify"
operation_key="rsc1_post_notify_promote_0"/>
+ <pseudo_event id="41" operation="notified"
operation_key="rsc1_confirmed-post_notify_promote_0"/>
</trigger>
</inputs>
</synapse>
@@ -470,7 +470,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="36" priority="1000000">
+ <synapse id="36">
<action_set>
<pseudo_event id="28" operation="notify"
operation_key="rsc1_post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="start"
CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
@@ -482,7 +482,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="37">
+ <synapse id="37" priority="1000000">
<action_set>
<pseudo_event id="29" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="start" CRM_meta_clone_max="5"
CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
@@ -574,7 +574,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="42" priority="1000000">
+ <synapse id="42">
<action_set>
<pseudo_event id="40" operation="notify"
operation_key="rsc1_post_notify_promote_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="promote"
CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
@@ -586,7 +586,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="43">
+ <synapse id="43" priority="1000000">
<action_set>
<pseudo_event id="41" operation="notified"
operation_key="rsc1_confirmed-post_notify_promote_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="promote" CRM_meta_clone_max="5"
CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-2.dot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- master-2.dot 29 May 2006 10:09:05 -0000 1.4
+++ master-2.dot 1 Jun 2006 11:31:41 -0000 1.5
@@ -86,6 +86,7 @@
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold]
"child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style =
dashed]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style =
bold]
"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style =
bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-2.exp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- master-2.exp 29 May 2006 10:09:05 -0000 1.16
+++ master-2.exp 1 Jun 2006 11:31:41 -0000 1.17
@@ -388,7 +388,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="32" priority="1000000">
+ <synapse id="32">
<action_set>
<pseudo_event id="24" operation="notify"
operation_key="rsc1_post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="start"
CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
@@ -400,7 +400,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="33">
+ <synapse id="33" priority="1000000">
<action_set>
<pseudo_event id="25" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="start" CRM_meta_clone_max="5"
CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
@@ -492,7 +492,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="38" priority="1000000">
+ <synapse id="38">
<action_set>
<pseudo_event id="36" operation="notify"
operation_key="rsc1_post_notify_promote_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="promote"
CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
@@ -504,7 +504,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="39">
+ <synapse id="39" priority="1000000">
<action_set>
<pseudo_event id="37" operation="notified"
operation_key="rsc1_confirmed-post_notify_promote_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="promote" CRM_meta_clone_max="5"
CRM_meta_clone_node_max="2" CRM_meta_master_max="2"
CRM_meta_master_node_max="1"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-1.dot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- notify-1.dot 5 May 2006 13:08:53 -0000 1.9
+++ notify-1.dot 1 Jun 2006 11:31:41 -0000 1.10
@@ -53,6 +53,7 @@
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed]
"child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style =
dashed]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style =
bold]
"child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0"
[ style = bold]
"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
@@ -74,6 +75,7 @@
"rsc2_stop_0" -> "rsc2_start_0" [ style = dashed]
"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
"rsc2_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_pre_notify_start_0" [ style =
dashed]
"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style =
dashed]
"rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style =
dashed]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-1.exp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- notify-1.exp 26 May 2006 14:54:00 -0000 1.23
+++ notify-1.exp 1 Jun 2006 11:31:41 -0000 1.24
@@ -113,7 +113,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="9" priority="1000000">
+ <synapse id="9">
<action_set>
<pseudo_event id="12" operation="notify"
operation_key="rsc1_post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="start"
CRM_meta_clone_max="2" CRM_meta_clone_node_max="2"/>
@@ -125,7 +125,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="10">
+ <synapse id="10" priority="1000000">
<action_set>
<pseudo_event id="13" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="start" CRM_meta_clone_max="2"
CRM_meta_clone_node_max="2"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-2.dot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- notify-2.dot 5 May 2006 13:08:53 -0000 1.9
+++ notify-2.dot 1 Jun 2006 11:31:41 -0000 1.10
@@ -53,6 +53,7 @@
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed]
"child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style =
dashed]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style =
bold]
"child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0"
[ style = bold]
"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
@@ -74,6 +75,7 @@
"rsc2_stop_0" -> "rsc2_start_0" [ style = dashed]
"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
"rsc2_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_pre_notify_start_0" [ style =
dashed]
"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style =
dashed]
"rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style =
dashed]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-2.exp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- notify-2.exp 26 May 2006 14:54:00 -0000 1.21
+++ notify-2.exp 1 Jun 2006 11:31:41 -0000 1.22
@@ -113,7 +113,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="9" priority="1000000">
+ <synapse id="9">
<action_set>
<pseudo_event id="12" operation="notify"
operation_key="rsc1_post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="start"
CRM_meta_clone_max="2" CRM_meta_clone_node_max="2"/>
@@ -125,7 +125,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="10">
+ <synapse id="10" priority="1000000">
<action_set>
<pseudo_event id="13" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="start" CRM_meta_clone_max="2"
CRM_meta_clone_node_max="2"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-3.dot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- notify-3.dot 5 May 2006 13:08:53 -0000 1.10
+++ notify-3.dot 1 Jun 2006 11:31:41 -0000 1.11
@@ -65,6 +65,7 @@
"child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed]
"child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style =
bold]
"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style =
bold]
"child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0"
[ style = bold]
"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
@@ -88,6 +89,7 @@
"rsc2_stop_0" -> "rsc2_start_0" [ style = dashed]
"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
"rsc2_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_pre_notify_start_0" [ style =
dashed]
"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style =
dashed]
"rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style =
dashed]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-3.exp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- notify-3.exp 26 May 2006 14:54:00 -0000 1.21
+++ notify-3.exp 1 Jun 2006 11:31:41 -0000 1.22
@@ -169,7 +169,11 @@
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="pre" CRM_meta_notify_operation="start"
CRM_meta_clone_max="2" CRM_meta_clone_node_max="2"/>
</pseudo_event>
</action_set>
- <inputs/>
+ <inputs>
+ <trigger>
+ <pseudo_event id="24" operation="notified"
operation_key="rsc1_confirmed-post_notify_stop_0"/>
+ </trigger>
+ </inputs>
</synapse>
<synapse id="13">
<action_set>
@@ -186,7 +190,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="14" priority="1000000">
+ <synapse id="14">
<action_set>
<pseudo_event id="17" operation="notify"
operation_key="rsc1_post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="start"
CRM_meta_clone_max="2" CRM_meta_clone_node_max="2"/>
@@ -198,7 +202,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="15">
+ <synapse id="15" priority="1000000">
<action_set>
<pseudo_event id="18" operation="notified"
operation_key="rsc1_confirmed-post_notify_start_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="start" CRM_meta_clone_max="2"
CRM_meta_clone_node_max="2"/>
@@ -269,7 +273,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="20" priority="1000000">
+ <synapse id="20">
<action_set>
<pseudo_event id="23" operation="notify"
operation_key="rsc1_post_notify_stop_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_confirm="yes"
CRM_meta_notify_type="post" CRM_meta_notify_operation="stop"
CRM_meta_clone_max="2" CRM_meta_clone_node_max="2"/>
@@ -281,7 +285,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="21">
+ <synapse id="21" priority="1000000">
<action_set>
<pseudo_event id="24" operation="notified"
operation_key="rsc1_confirmed-post_notify_stop_0">
<attributes crm_feature_set="1.0.6" CRM_meta_notify_type="pre"
CRM_meta_notify_operation="stop" CRM_meta_clone_max="2"
CRM_meta_clone_node_max="2"/>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 3
*******************************************
