Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Jun 2006 06:55:54 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Logging patch for OSDL #1340
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- events.c 1 Jun 2006 14:48:07 -0000 1.19
+++ events.c 22 Jun 2006 12:55:53 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.19 2006/06/01 14:48:07 andrew Exp $ */
+/* $Id: events.c,v 1.20 2006/06/22 12:55:53 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -555,6 +555,7 @@
/* unexpected event, trigger a pe-recompute */
/* possibly do this only for certain types of actions */
crm_warn("Event not found.");
+ crm_log_xml_info(event, "match:pending");
abort_transition(INFINITY, tg_restart, "Unexpected event", event);
return;
}
------------------------------
Message: 2
Date: Thu, 22 Jun 2006 06:58:45 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
A better label
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- events.c 22 Jun 2006 12:55:53 -0000 1.20
+++ events.c 22 Jun 2006 12:58:45 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.20 2006/06/22 12:55:53 andrew Exp $ */
+/* $Id: events.c,v 1.21 2006/06/22 12:58:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -555,7 +555,7 @@
/* unexpected event, trigger a pe-recompute */
/* possibly do this only for certain types of actions */
crm_warn("Event not found.");
- crm_log_xml_info(event, "match:pending");
+ crm_log_xml_info(event, "match:not-found");
abort_transition(INFINITY, tg_restart, "Unexpected event", event);
return;
}
------------------------------
Message: 3
Date: Thu, 22 Jun 2006 07:27:28 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
OSDL #1340
Construct an ID that the TE will be able to match against when dealing
with anonymous clones
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- graph.c 21 Jun 2006 14:48:01 -0000 1.99
+++ graph.c 22 Jun 2006 13:27:28 -0000 1.100
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.99 2006/06/21 14:48:01 andrew Exp $ */
+/* $Id: graph.c,v 1.100 2006/06/22 13:27:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -372,8 +372,20 @@
crm_free(action_id_s);
crm_xml_add(action_xml, XML_LRM_ATTR_TASK, action->task);
- crm_xml_add(action_xml, XML_LRM_ATTR_TASK_KEY, action->uuid);
-
+ if(action->rsc != NULL && action->rsc->clone_name != NULL) {
+ char *clone_key = NULL;
+ const char *interval_s = g_hash_table_lookup(action->meta,
"interval");
+ int interval = crm_parse_int(interval_s, "0");
+
+ clone_key = generate_op_key(action->rsc->clone_name,
action->task, interval);
+ crm_xml_add(action_xml, XML_LRM_ATTR_TASK_KEY, clone_key);
+ crm_xml_add(action_xml, "internal_"XML_LRM_ATTR_TASK_KEY,
action->uuid);
+ crm_free(clone_key);
+
+ } else {
+ crm_xml_add(action_xml, XML_LRM_ATTR_TASK_KEY, action->uuid);
+ }
+
if(needs_node_info && action->node != NULL) {
crm_xml_add(action_xml, XML_LRM_ATTR_TARGET,
action->node->details->uname);
------------------------------
Message: 4
Date: Thu, 22 Jun 2006 07:32:16 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
group.c
Log Message:
Remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/group.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- group.c 8 Jun 2006 13:39:10 -0000 1.3
+++ group.c 22 Jun 2006 13:32:15 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.3 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: group.c,v 1.4 2006/06/22 13:32:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -63,7 +63,6 @@
const char *clone_id = NULL;
crm_debug_3("Processing resource %s...", rsc->id);
-/* rsc->id = "dummy_group_rsc_id"; */
crm_malloc0(group_data, sizeof(group_variant_data_t));
group_data->num_children = 0;
@@ -85,7 +84,6 @@
/* this is a bit of a hack - but simplifies everything else */
ha_msg_mod(xml_self, F_XML_TAGNAME, XML_CIB_TAG_RESOURCE);
-/* set_id(xml_self, "self", -1); */
if(common_unpack(xml_self, &self, NULL, data_set)) {
group_data->self = self;
------------------------------
Message: 5
Date: Thu, 22 Jun 2006 07:32:16 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- graph.c 22 Jun 2006 13:27:28 -0000 1.100
+++ graph.c 22 Jun 2006 13:32:15 -0000 1.101
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.100 2006/06/22 13:27:28 andrew Exp $ */
+/* $Id: graph.c,v 1.101 2006/06/22 13:32:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -304,25 +304,6 @@
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) { */
-
-/* /\* depend on the stop action which will fail *\/ */
-/* pe_err("SHARED RESOURCE %s WILL REMAIN BLOCKED" */
-/* " ON NODE %s UNTIL %s", */
-/* rsc->id, node->details->uname, */
-/* data_set->stonith_enabled?"QUORUM
RETURNS":"CLEANED UP MANUALLY"); */
-/* continue; */
-
-/* } else if((rsc->unclean || node->details->unclean) */
-/* && rsc->stopfail_type == pesf_ignore) { */
-/* /\* nothing to do here *\/ */
-/* pe_err("SHARED RESOURCE %s IS NOT PROTECTED", rsc->id);
*/
-/* continue; */
);
return TRUE;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 82
********************************************
