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: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 25 May 2006 05:54:36 -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:
native.c
Log Message:
Doesnt need to be an ERROR
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- native.c 25 May 2006 11:49:54 -0000 1.141
+++ native.c 25 May 2006 11:54:35 -0000 1.142
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.141 2006/05/25 11:49:54 andrew Exp $ */
+/* $Id: native.c,v 1.142 2006/05/25 11:54:35 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1762,7 +1762,7 @@
CRM_CHECK(node != NULL, return NULL);
if(node->details->online == FALSE) {
- crm_err("Skipping notification for %s", rsc->id);
+ crm_info("Skipping notification for %s", rsc->id);
return NULL;
}
------------------------------
Message: 2
Date: Thu, 25 May 2006 08:20:27 -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:
actions.c callbacks.c events.c
Log Message:
Look for the properties in the meta namespace (Novell #178488)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- actions.c 22 May 2006 10:26:20 -0000 1.30
+++ actions.c 25 May 2006 14:20:26 -0000 1.31
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.30 2006/05/22 10:26:20 andrew Exp $ */
+/* $Id: actions.c,v 1.31 2006/05/25 14:20:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -116,20 +116,21 @@
id = ID(action->xml);
target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
- type = g_hash_table_lookup(action->params, "stonith_action");
-
- CRM_CHECK(id != NULL, return FALSE);
- CRM_CHECK(uuid != NULL, return FALSE);
- CRM_CHECK(type != NULL, return FALSE);
- CRM_CHECK(target != NULL, return FALSE);
-
- if(id == NULL || uuid == NULL || target == NULL) {
- /* error */
- te_log_action(LOG_ERR, "Corrupted command (id=%s): no node",
- crm_str(id));
- return FALSE;
- }
+ type = g_hash_table_lookup(action->params,
crm_meta_name("stonith_action"));
+ CRM_CHECK(id != NULL,
+ crm_log_xml_warn(action->xml, "BadAction");
+ return FALSE);
+ CRM_CHECK(uuid != NULL,
+ crm_log_xml_warn(action->xml, "BadAction");
+ return FALSE);
+ CRM_CHECK(type != NULL,
+ crm_log_xml_warn(action->xml, "BadAction");
+ return FALSE);
+ CRM_CHECK(target != NULL,
+ crm_log_xml_warn(action->xml, "BadAction");
+ return FALSE);
+
te_log_action(LOG_INFO,
"Executing %s fencing operation (%s) on %s (timeout=%d)",
type, id, target,
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- callbacks.c 8 May 2006 07:42:19 -0000 1.80
+++ callbacks.c 25 May 2006 14:20:26 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.80 2006/05/08 07:42:19 andrew Exp $ */
+/* $Id: callbacks.c,v 1.81 2006/05/25 14:20:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -300,7 +300,8 @@
case STONITH_GENERIC:
stonith_action->failed = TRUE;
allow_fail = g_hash_table_lookup(
- stonith_action->params, XML_ATTR_TE_ALLOWFAIL);
+ stonith_action->params,
+ crm_meta_name(XML_ATTR_TE_ALLOWFAIL));
if(FALSE == crm_is_true(allow_fail)) {
crm_err("Stonith of %s failed (%d)..."
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- events.c 22 May 2006 08:27:33 -0000 1.17
+++ events.c 25 May 2006 14:20:26 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.17 2006/05/22 08:27:33 andrew Exp $ */
+/* $Id: events.c,v 1.18 2006/05/25 14:20:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -178,7 +178,8 @@
return;
}
- interval = g_hash_table_lookup(action->params, "interval");
+ interval = g_hash_table_lookup(
+ action->params, crm_meta_name("interval"));
if(interval == NULL) {
return;
}
------------------------------
Message: 3
Date: Thu, 25 May 2006 08:45:54 -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:
callbacks.c actions.c
Log Message:
Novell #178764 - TE doesn't abort transition
When an internal TE error occurs and an action cannot be performed, the
TE got stuck in an logic loop which was detected by an assert.
- Mark all graphs as complete before notifying the CRM
- Handle failures as increases in abort priority
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- callbacks.c 25 May 2006 14:20:26 -0000 1.81
+++ callbacks.c 25 May 2006 14:45:53 -0000 1.82
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.81 2006/05/25 14:20:26 andrew Exp $ */
+/* $Id: callbacks.c,v 1.82 2006/05/25 14:45:53 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -531,6 +531,7 @@
print_graph(LOG_WARNING, transition_graph);
}
+ transition_graph->complete = TRUE;
notify_crmd(transition_graph);
return TRUE;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- actions.c 25 May 2006 14:20:26 -0000 1.31
+++ actions.c 25 May 2006 14:45:53 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.31 2006/05/25 14:20:26 andrew Exp $ */
+/* $Id: actions.c,v 1.32 2006/05/25 14:45:53 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -457,7 +457,7 @@
return;
}
- CRM_CHECK(graph->complete, return);
+ CRM_CHECK(graph->complete, graph->complete = TRUE);
switch(graph->completion_action) {
case tg_stop:
------------------------------
Message: 4
Date: Thu, 25 May 2006 08:45:54 -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/transition
Modified Files:
graph.c
Log Message:
Novell #178764 - TE doesn't abort transition
When an internal TE error occurs and an action cannot be performed, the
TE got stuck in an logic loop which was detected by an assert.
- Mark all graphs as complete before notifying the CRM
- Handle failures as increases in abort priority
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- graph.c 8 May 2006 09:58:57 -0000 1.13
+++ graph.c 25 May 2006 14:45:54 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.13 2006/05/08 09:58:57 andrew Exp $ */
+/* $Id: graph.c,v 1.14 2006/05/25 14:45:54 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -274,11 +274,12 @@
} else {
crm_debug_2("Synapse %d pending", synapse->id);
if(should_fire_synapse(synapse)) {
- if(fire_synapse(graph, synapse) == FALSE) {
- return transition_failed;
- }
num_fired++;
-
+ CRM_CHECK(fire_synapse(graph, synapse),
+ graph->abort_priority = INFINITY;
+ num_incomplete++;
+ num_fired--);
+
} else {
crm_debug_2("Synapse %d cannot fire",
synapse->id);
------------------------------
_______________________________________________
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 81
********************************************
