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: lib by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 18 Feb 2006 05:43:59 -0700 (MST)
From: [email protected]
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/transition
Modified Files:
utils.c
Log Message:
Update the graph's completion action regardless of abort priority
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- utils.c 16 Feb 2006 15:20:33 -0000 1.2
+++ utils.c 18 Feb 2006 12:43:58 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.2 2006/02/16 15:20:33 andrew Exp $ */
+/* $Id: utils.c,v 1.3 2006/02/18 12:43:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -225,13 +225,12 @@
graph->abort_reason);
}
graph->abort_reason = abort_reason;
- if(action > 0) {
- if(graph->completion_action != action) {
- crm_info("Abort action %d superceeded by %d",
- graph->completion_action, action);
- }
- graph->completion_action = action;
- }
+ }
+
+ if(graph->completion_action < action) {
+ crm_info("Abort action %d superceeded by %d",
+ graph->completion_action, action);
+ graph->completion_action = action;
}
}
------------------------------
Message: 2
Date: Sat, 18 Feb 2006 05:44:17 -0700 (MST)
From: [email protected]
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/transition
Modified Files:
unpack.c
Log Message:
For now, just warn
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/unpack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- unpack.c 17 Feb 2006 13:32:07 -0000 1.2
+++ unpack.c 18 Feb 2006 12:44:17 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.2 2006/02/17 13:32:07 andrew Exp $ */
+/* $Id: unpack.c,v 1.3 2006/02/18 12:44:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -90,7 +90,7 @@
crm_malloc0(action->timer, sizeof(te_timer_t));
action->timer->timeout = 2 * action->timeout;
action->timer->source_id = 0;
- action->timer->reason = timeout_action;
+ action->timer->reason = timeout_action_warn;
action->timer->action = action;
return action;
------------------------------
Message: 3
Date: Sat, 18 Feb 2006 05:48:17 -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:
unpack.c
Log Message:
Remove disabled code
If a node requested a shutdown, then they're no longer expected to be up.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- unpack.c 17 Feb 2006 14:44:03 -0000 1.156
+++ unpack.c 18 Feb 2006 12:48:16 -0000 1.157
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.156 2006/02/17 14:44:03 andrew Exp $ */
+/* $Id: unpack.c,v 1.157 2006/02/18 12:48:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -594,18 +594,10 @@
determine_online_status(
crm_data_t * node_state, node_t *this_node, pe_working_set_t *data_set)
{
+ int shutdown = 0;
gboolean online = FALSE;
const char *exp_state =
crm_element_value(node_state, XML_CIB_ATTR_EXPSTATE);
-/* const char *join_state = */
-/* crm_element_value(node_state, XML_CIB_ATTR_JOINSTATE); */
-/* const char *crm_state = */
-/* crm_element_value(node_state, XML_CIB_ATTR_CRMDSTATE); */
-/* const char *ccm_state = */
-/* crm_element_value(node_state, XML_CIB_ATTR_INCCM); */
-/* const char *ha_state = */
-/* crm_element_value(node_state, XML_CIB_ATTR_HASTATE); */
- int shutdown = 0;
if(this_node == NULL) {
pe_config_err("No node to check");
@@ -614,14 +606,15 @@
ha_msg_value_int(node_state, XML_CIB_ATTR_SHUTDOWN, &shutdown);
+ this_node->details->expected_up = FALSE;
if(safe_str_eq(exp_state, CRMD_JOINSTATE_MEMBER)) {
this_node->details->expected_up = TRUE;
}
+
+ this_node->details->shutdown = FALSE;
if(shutdown != 0) {
this_node->details->shutdown = TRUE;
-#if 0
this_node->details->expected_up = FALSE;
-#endif
}
if(data_set->stonith_enabled == FALSE) {
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 78
********************************************
