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: include by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Fri, 23 Jun 2006 06:34:53 -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: When sending a stop action, it would seem to make sense that the RA should use the params it already has (rather than any new ones that may have caused the stop). Eg. if the ip param is changed, clearly we want to bring down the *old* value not the new one. We can do this by leaving out the resource params and letting the LRM populate them with its cached set. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -3 -r1.102 -r1.103 --- graph.c 22 Jun 2006 16:20:27 -0000 1.102 +++ graph.c 23 Jun 2006 12:34:51 -0000 1.103 @@ -1,4 +1,4 @@ -/* $Id: graph.c,v 1.102 2006/06/22 16:20:27 andrew Exp $ */ +/* $Id: graph.c,v 1.103 2006/06/23 12:34:51 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -432,7 +432,7 @@ crm_xml_add(args_xml, XML_ATTR_CRM_VERSION, CRM_FEATURE_SET); g_hash_table_foreach(action->extra, hash2field, args_xml); - if(action->rsc != NULL) { + if(action->rsc != NULL && safe_str_neq(action->task, CRMD_ACTION_STOP)) { g_hash_table_foreach(action->rsc->parameters, hash2field, args_xml); } ------------------------------ Message: 2 Date: Fri, 23 Jun 2006 06:35: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/tengine Modified Files: callbacks.c Log Message: TE Logging =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -3 -r1.84 -r1.85 --- callbacks.c 23 Jun 2006 08:33:53 -0000 1.84 +++ callbacks.c 23 Jun 2006 12:35:15 -0000 1.85 @@ -1,4 +1,4 @@ -/* $Id: callbacks.c,v 1.84 2006/06/23 08:33:53 andrew Exp $ */ +/* $Id: callbacks.c,v 1.85 2006/06/23 12:35:15 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -230,7 +230,7 @@ } else if(strcasecmp(op, CRM_OP_TRANSITION) == 0) { const char *graph_file = cl_get_string(msg, F_CRM_TGRAPH); -/* const char *graph_input = cl_get_string(msg, F_CRM_TGRAPH_INPUT); */ + const char *graph_input = cl_get_string(msg, F_CRM_TGRAPH_INPUT); CRM_CHECK(graph_file != NULL, crm_err("No graph filename provided"); return TRUE); if(transition_graph->complete == FALSE) { @@ -246,7 +246,7 @@ return TRUE); destroy_graph(transition_graph); - crm_debug("Read graph from: %s", graph_file); + crm_debug("Read graph from %s based on %s", graph_file, graph_input); transition_graph = unpack_graph(graph_data); start_global_timer(transition_timer, transition_graph->transition_timeout); ------------------------------ Message: 3 Date: Fri, 23 Jun 2006 06:41:18 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org 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/pengine Added Files: .cvsignore Log Message: ignore file ------------------------------ _______________________________________________ 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 91 ********************************************