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])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 10 Jan 2006 06:52:12 -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:
stages.c
Log Message:
Since the DC shuts itself down - we need to make sure it first shuts down
any other nodes that need to do so.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- stages.c 2 Nov 2005 13:19:30 -0000 1.83
+++ stages.c 10 Jan 2006 13:52:11 -0000 1.84
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.83 2005/11/02 13:19:30 andrew Exp $ */
+/* $Id: stages.c,v 1.84 2006/01/10 13:52:11 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -300,8 +300,10 @@
{
action_t *down_op = NULL;
action_t *stonith_op = NULL;
+ action_t *dc_down = NULL;
+
crm_debug_3("Processing fencing and shutdown cases");
-
+
slist_iter(
node, node_t, data_set->nodes, lpc,
if(node->details->online && node->details->shutdown) {
@@ -315,6 +317,10 @@
shutdown_constraints(
node, down_op, data_set);
+
+ if(node->details->is_dc) {
+ dc_down = down_op;
+ }
}
if(node->details->unclean
@@ -345,6 +351,10 @@
if(down_op != NULL) {
down_op->failure_is_fatal = FALSE;
}
+
+ if(node->details->is_dc) {
+ dc_down = stonith_op;
+ }
}
if(node->details->unclean) {
@@ -354,6 +364,28 @@
);
+ if(dc_down != NULL) {
+ GListPtr shutdown_matches = find_actions(
+ data_set->actions, CRM_OP_SHUTDOWN, NULL);
+
+ crm_debug_2("Ordering shutdowns before %s on %s (DC)",
+ down_op->task, down_op->node->details->uname);
+
+ slist_iter(
+ action, action_t, shutdown_matches, lpc,
+ if(action->node->details->is_dc) {
+ continue;
+ }
+ crm_debug("Ordering shutdown on %s before %s on %s",
+ action->node->details->uname,
+ dc_down->task, dc_down->node->details->uname);
+
+ custom_action_order(
+ NULL, crm_strdup(action->task), action,
+ NULL, crm_strdup(dc_down->task), dc_down,
+ pe_ordering_manditory, data_set);
+ );
+ }
return TRUE;
}
@@ -497,7 +529,7 @@
* new resource count
*/
- crm_debug("assigned %s to color %d", chosen->details->uname, color->id);
+ crm_debug_2("assigned %s to color %d", chosen->details->uname,
color->id);
chosen->details->num_resources += color->details->num_resources;
color->details->chosen_node = node_copy(chosen);
------------------------------
Message: 2
Date: Tue, 10 Jan 2006 07:13:22 -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:
incarnation.c regression.sh
Log Message:
Fix for unrunnable actions that appeared in a CTS run
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- incarnation.c 7 Jan 2006 21:00:24 -0000 1.70
+++ incarnation.c 10 Jan 2006 14:13:22 -0000 1.71
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.70 2006/01/07 21:00:24 andrew Exp $ */
+/* $Id: incarnation.c,v 1.71 2006/01/10 14:13:22 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -425,12 +425,19 @@
return;
} else if(action->optional) {
+ crm_debug_3("Skipping optional: %s", action->uuid);
+ continue;
+
+ } else if(action->pseudo == FALSE && action->runnable == FALSE){
+ crm_debug_3("Skipping unrunnable: %s", action->uuid);
continue;
} else if(safe_str_eq(CRMD_ACTION_STOP, action->task)) {
+ crm_debug_2("Stopping due to: %s", action->uuid);
*stopping = TRUE;
} else if(safe_str_eq(CRMD_ACTION_START, action->task)) {
+ crm_debug_2("Starting due to: %s", action->uuid);
*starting = TRUE;
}
);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- regression.sh 22 Dec 2005 21:05:28 -0000 1.71
+++ regression.sh 10 Jan 2006 14:13:22 -0000 1.72
@@ -190,7 +190,7 @@
do_test 797 "Bugzilla 797"
do_test 829 "Bugzilla 829"
do_test 994 "Bugzilla 994"
-
+do_test unrunnable-1 "Unrunnable"
echo ""
do_test bad1 "Bad node "
------------------------------
Message: 3
Date: Tue, 10 Jan 2006 07:13:22 -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:
829.dot 829.exp
Added Files:
unrunnable-1.dot unrunnable-1.exp unrunnable-1.xml
Log Message:
Fix for unrunnable actions that appeared in a CTS run
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.dot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- 829.dot 24 Oct 2005 07:48:00 -0000 1.9
+++ 829.dot 10 Jan 2006 14:13:22 -0000 1.10
@@ -33,8 +33,8 @@
"DoFencing:child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue"
fontcolor="black" ]
"DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
"DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
-"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
"stonith c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style =
dashed]
"DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = dashed]
@@ -50,7 +50,7 @@
"rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style =
bold]
"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style =
bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style =
dashed]
"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style =
dashed]
"DoFencing:child_DoFencing:1_stop_0 c001n03" ->
"DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style =
dashed]
@@ -65,9 +65,9 @@
"DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style
= dashed]
"DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing_running_0" [ style
= dashed]
"DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style
= dashed]
-"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style
= bold]
+"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style
= dashed]
"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style
= dashed]
"DoFencing:child_DoFencing:2_stop_0 c001n01" -> "DoFencing_stopped_0" [ style
= dashed]
"DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style
= dashed]
-"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- 829.exp 24 Oct 2005 07:48:00 -0000 1.12
+++ 829.exp 10 Jan 2006 14:13:22 -0000 1.13
@@ -42,36 +42,9 @@
<attributes crm_feature_set="1.0.3"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <pseudo_event id="34" rsc_id="DoFencing" operation="stop"
operation_key="DoFencing_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
- <synapse id="4">
- <action_set>
- <pseudo_event id="34" rsc_id="DoFencing" operation="stop"
operation_key="DoFencing_stop_0">
- <attributes crm_feature_set="1.0.3"/>
- </pseudo_event>
- </action_set>
<inputs/>
</synapse>
- <synapse id="5">
- <action_set>
- <pseudo_event id="35" rsc_id="DoFencing" operation="stopped"
operation_key="DoFencing_stopped_0">
- <attributes crm_feature_set="1.0.3"/>
- </pseudo_event>
- </action_set>
- <inputs>
- <trigger>
- <pseudo_event id="25" rsc_id="DoFencing:child_DoFencing:0"
operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0"/>
- </trigger>
- <trigger>
- <pseudo_event id="34" rsc_id="DoFencing" operation="stop"
operation_key="DoFencing_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
- <synapse id="6">
+ <synapse id="4">
<action_set>
<crm_event id="36" operation="stonith" operation_key="stonith"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes on_node="c001n02"
on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" crm_feature_set="1.0.3"/>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 14
********************************************
