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])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 24 May 2006 13:14:59 -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/crmd
Modified Files:
lrm.c
Log Message:
Look for notify attrs in the new namespace
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -3 -r1.193 -r1.194
--- lrm.c 22 May 2006 07:16:31 -0000 1.193
+++ lrm.c 24 May 2006 19:14:59 -0000 1.194
@@ -365,9 +365,17 @@
if(safe_str_eq(op->op_type, CRMD_ACTION_NOTIFY)) {
const char *n_type = g_hash_table_lookup(
- op->params, "notify_type");
+ op->params, crm_meta_name("notify_type"));
const char *n_task = g_hash_table_lookup(
- op->params, "notify_operation");
+ op->params, crm_meta_name("notify_operation"));
+#if CRM_DEPRECATED_SINCE_2_0_5
+ if(n_type == NULL) {
+ n_type = g_hash_table_lookup(op->params, "notify_type");
+ }
+ if(n_task == NULL) {
+ n_task = g_hash_table_lookup(op->params,
"notify_operation");
+ }
+#endif
CRM_DEV_ASSERT(n_type != NULL);
CRM_DEV_ASSERT(n_task != NULL);
op_id = generate_notify_key(op->rsc_id, n_type, n_task);
@@ -475,9 +483,8 @@
state = CRMD_ACTION_STARTED;
} else {
- crm_warn("Using status \"%s\" for op \"%s\""
- "... this is still in the experimental
stage.",
- CRMD_ACTION_GENERIC_OK, op->op_type);
+ crm_debug("Using status \"%s\" for op \"%s\"",
+ CRMD_ACTION_GENERIC_OK, op->op_type);
state = CRMD_ACTION_GENERIC_OK;
}
break;
------------------------------
Message: 2
Date: Wed, 24 May 2006 14:13:35 -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:
complex.c
Log Message:
Set the resource parent
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- complex.c 23 May 2006 10:00:31 -0000 1.91
+++ complex.c 24 May 2006 20:13:34 -0000 1.92
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.91 2006/05/23 10:00:31 andrew Exp $ */
+/* $Id: complex.c,v 1.92 2006/05/24 20:13:34 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -193,7 +193,7 @@
}
(*rsc)->xml = xml_obj;
- (*rsc)->parent = NULL;
+ (*rsc)->parent = parent;
(*rsc)->ops_xml = find_xml_node(xml_obj, "operations", FALSE);
(*rsc)->variant = get_resource_type(crm_element_name(xml_obj));
if((*rsc)->variant == pe_unknown) {
@@ -248,7 +248,8 @@
NULL, 0, data_set);
if(parent != NULL) {
- g_hash_table_foreach(parent->parameters, dup_attr,
(*rsc)->parameters);
+ g_hash_table_foreach(
+ parent->parameters, dup_attr, (*rsc)->parameters);
}
(*rsc)->runnable = TRUE;
------------------------------
Message: 3
Date: Wed, 24 May 2006 14:25:32 -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:
We should wait for the stonith action to complete before declaring the stop
done (which will also delay the start action correctly).
However if there is no stop action to be executed... then order based on the
start action.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- graph.c 23 May 2006 09:57:52 -0000 1.90
+++ graph.c 24 May 2006 20:25:32 -0000 1.91
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.90 2006/05/23 09:57:52 andrew Exp $ */
+/* $Id: graph.c,v 1.91 2006/05/24 20:25:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -259,10 +259,18 @@
*/
action->pseudo = TRUE;
action->runnable = TRUE;
- custom_action_order(
- NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
- rsc, start_key(rsc), NULL,
- pe_ordering_manditory,
data_set);
+ if(action->optional) {
+ custom_action_order(
+ NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
+ rsc, start_key(rsc),
NULL,
+ pe_ordering_manditory,
data_set);
+ } else {
+ custom_action_order(
+ NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
+ rsc, NULL, action,
+ pe_ordering_manditory,
data_set);
+ }
+
} else {
crm_info("Moving healthy resource %s"
" off %s before fencing",
------------------------------
Message: 4
Date: Wed, 24 May 2006 14:45:58 -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:
Fix for Novell #178488: Notifications not generated for failed nodes
They were generated but marked optional due to the stop being unrunnable.
After the stop has been marked as a psuedo op (due to the stonith),
rerun the action creation so that everything comes out as it should.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- graph.c 24 May 2006 20:25:32 -0000 1.91
+++ graph.c 24 May 2006 20:45:57 -0000 1.92
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.91 2006/05/24 20:25:32 andrew Exp $ */
+/* $Id: graph.c,v 1.92 2006/05/24 20:45:57 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -257,6 +257,7 @@
/* the stop would never complete and is
* now implied by the stonith operation
*/
+ rsc->failed = TRUE;
action->pseudo = TRUE;
action->runnable = TRUE;
if(action->optional) {
@@ -264,12 +265,16 @@
NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
rsc, start_key(rsc),
NULL,
pe_ordering_manditory,
data_set);
- } else {
+ } else {
custom_action_order(
NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
rsc, NULL, action,
pe_ordering_manditory,
data_set);
}
+ if(action->rsc->parent) {
+ crm_info("Recalling actions for
%s", action->rsc->parent->id);
+
action->rsc->parent->fns->create_actions(action->rsc->parent, data_set);
+ }
} else {
crm_info("Moving healthy resource %s"
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 78
********************************************
