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: lib by andrew from
([email protected])
4. Linux-HA CVS: include by andrew from
([email protected])
5. Linux-HA CVS: include by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Apr 2006 06:17:38 -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:
graph.c
Log Message:
The demote of a failed resource is also implied by a stonith
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- graph.c 10 Apr 2006 07:23:27 -0000 1.80
+++ graph.c 10 Apr 2006 12:17:38 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.80 2006/04/10 07:23:27 andrew Exp $ */
+/* $Id: graph.c,v 1.81 2006/04/10 12:17:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -208,7 +208,7 @@
action_t *stonith_op, action_t *shutdown_op,
pe_working_set_t *data_set)
{
- GListPtr stop_actions = NULL;
+ GListPtr action_list = NULL;
if(shutdown_op != NULL && stonith_op != NULL) {
/* stop everything we can via shutdown_constraints() and then
@@ -250,11 +250,11 @@
} else if(stonith_op != NULL) {
char *key = stop_key(rsc);
- stop_actions = find_actions(rsc->actions, key, node);
+ action_list = find_actions(rsc->actions, key, node);
crm_free(key);
slist_iter(
- action, action_t, stop_actions, lpc2,
+ action, action_t, action_list, lpc2,
if(node->details->online == FALSE
|| rsc->failed) {
crm_info("Stop of failed resource %s is"
@@ -284,8 +284,30 @@
}
);
- crm_debug_4("Adding stonith (%d) as an input to stop",
- stonith_op->id);
+ key = demote_key(rsc);
+ action_list = find_actions(rsc->actions, key, node);
+ crm_free(key);
+
+ slist_iter(
+ action, action_t, action_list, lpc2,
+ if(node->details->online == FALSE ||
rsc->failed) {
+ crm_info("Demote of failed resource %s
is"
+ " implict after %s is fenced",
+ rsc->id, node->details->uname);
+ /* the stop would never complete and is
+ * now implied by the stonith operation
+ */
+ action->pseudo = TRUE;
+ action->runnable = TRUE;
+ custom_action_order(
+ NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
+ rsc, demote_key(rsc), NULL,
+ pe_ordering_manditory,
data_set);
+ }
+ );
+
+/* crm_debug_4("Adding stonith (%d) as an input to stop",
*/
+/* stonith_op->id); */
/* } else if((rsc->unclean || node->details->unclean) */
/* && rsc->stopfail_type == pesf_block) { */
------------------------------
Message: 2
Date: Mon, 10 Apr 2006 06:43:48 -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/tengine
Modified Files:
events.c
Log Message:
Dont update the failcount for probes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- events.c 9 Apr 2006 17:01:58 -0000 1.11
+++ events.c 10 Apr 2006 12:43:48 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.11 2006/04/09 17:01:58 andrew Exp $ */
+/* $Id: events.c,v 1.12 2006/04/10 12:43:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -356,7 +356,10 @@
}
if(action->failed) {
- update_failcount(action, op_rc_i);
+ /* ignore probes */
+ if(target_rc != EXECRA_NOT_RUNNING) {
+ update_failcount(action, op_rc_i);
+ }
abort_transition(action->synapse->priority,
tg_restart, "Event failed", event);
------------------------------
Message: 3
Date: Mon, 10 Apr 2006 06:48:43 -0600 (MDT)
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/cib
Modified Files:
cib_attrs.c
Log Message:
Add options to the delete call
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- cib_attrs.c 9 Apr 2006 20:03:32 -0000 1.21
+++ cib_attrs.c 10 Apr 2006 12:48:43 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.21 2006/04/09 20:03:32 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.22 2006/04/10 12:48:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -312,7 +312,7 @@
enum cib_errors
-delete_attr(cib_t *the_cib,
+delete_attr(cib_t *the_cib, int options,
const char *section, const char *node_uuid, const char *set_name,
const char *attr_id, const char *attr_name, const char *attr_value)
{
@@ -344,7 +344,7 @@
rc = the_cib->cmds->delete(
the_cib, section, xml_obj, NULL,
- cib_sync_call|cib_quorum_override);
+ options|cib_quorum_override);
crm_free(local_set_name);
crm_free(local_attr_id);
@@ -534,7 +534,7 @@
enum cib_errors rc = cib_ok;
if(scope != NULL) {
standby_common;
- rc = delete_attr(the_cib, type, uuid, set_name,
+ rc = delete_attr(the_cib, cib_sync_call, type, uuid, set_name,
attr_id, attr_name, standby_value);
crm_free(attr_id);
crm_free(set_name);
------------------------------
Message: 4
Date: Mon, 10 Apr 2006 06:48:43 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
cib.h
Log Message:
Add options to the delete call
------------------------------
Message: 5
Date: Mon, 10 Apr 2006 06:49:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
util.h
Log Message:
Common function
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- util.h 3 Apr 2006 09:51:56 -0000 1.31
+++ util.h 10 Apr 2006 12:49:15 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.31 2006/04/03 09:51:56 andrew Exp $ */
+/* $Id: util.h,v 1.32 2006/04/10 12:49:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -132,4 +132,7 @@
extern void write_last_sequence(
const char *directory, const char *series, int sequence, int max);
+extern void crm_make_daemon(
+ const char *name, gboolean daemonize, const char *pidfile);
+
#endif
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 64
********************************************
