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) ---------------------------------------------------------------------- Message: 1 Date: Wed, 3 May 2006 03:01:52 -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/admin Modified Files: crm_resource.c Log Message: Handle a common mistake =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- crm_resource.c 3 May 2006 08:58:09 -0000 1.22 +++ crm_resource.c 3 May 2006 09:01:52 -0000 1.23 @@ -1,4 +1,4 @@ -/* $Id: crm_resource.c,v 1.22 2006/05/03 08:58:09 andrew Exp $ */ +/* $Id: crm_resource.c,v 1.23 2006/05/03 09:01:52 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -727,6 +727,10 @@ } else if(rsc_cmd == 'p') { crm_data_t *msg_data = NULL; + if(prop_value == NULL) { + fprintf(stderr, "You need to set a value with the -v option"); + return cib_NOTEXISTS; + } CRM_DEV_ASSERT(rsc_id != NULL); CRM_DEV_ASSERT(rsc_type != NULL); ------------------------------ Message: 2 Date: Wed, 3 May 2006 03:02:25 -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: native.c Log Message: Indicate if a resource has failed or not =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -3 -r1.130 -r1.131 --- native.c 26 Apr 2006 15:57:04 -0000 1.130 +++ native.c 3 May 2006 09:02:24 -0000 1.131 @@ -1,4 +1,4 @@ -/* $Id: native.c,v 1.130 2006/04/26 15:57:04 andrew Exp $ */ +/* $Id: native.c,v 1.131 2006/05/03 09:02:24 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -1014,13 +1014,13 @@ desc?": ":"", desc?desc:""); } else { - status_print("%s%s\t(%s%s%s:%s):\t%s %s%s", + status_print("%s%s\t(%s%s%s:%s):\t%s %s%s%s", pre_text?pre_text:"", rsc->id, prov?prov:"", prov?"::":"", class, crm_element_value(rsc->xml, XML_ATTR_TYPE), (rsc->variant!=pe_native)?"":role2text(rsc->role), (rsc->variant!=pe_native)?"":node!=NULL?node->details->uname:"", - rsc->is_managed?"":" (unmanaged) "); + rsc->is_managed?"":" (unmanaged)", rsc->failed?" FAILED":""); #if CURSES_ENABLED if(options & pe_print_ncurses) { ------------------------------ Message: 3 Date: Wed, 3 May 2006 03:02:46 -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: utils.c Log Message: Handle bad inputs =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v retrieving revision 1.133 retrieving revision 1.134 diff -u -3 -r1.133 -r1.134 --- utils.c 22 Apr 2006 17:35:44 -0000 1.133 +++ utils.c 3 May 2006 09:02:45 -0000 1.134 @@ -1,4 +1,4 @@ -/* $Id: utils.c,v 1.133 2006/04/22 17:35:44 andrew Exp $ */ +/* $Id: utils.c,v 1.134 2006/05/03 09:02:45 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -389,6 +389,10 @@ resource_t *rsc = NULL; resource_t *child_rsc = NULL; + if(id == NULL) { + return NULL; + } + crm_debug_4("Looking for %s in %d objects", id, g_list_length(rsc_list)); for(lpc = 0; lpc < g_list_length(rsc_list); lpc++) { rsc = g_list_nth_data(rsc_list, lpc); ------------------------------ Message: 4 Date: Wed, 3 May 2006 03:03:22 -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/transition Modified Files: unpack.c Log Message: Now that we use < as the prioirty filter we can set this to 0 =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/unpack.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- unpack.c 18 Mar 2006 17:23:49 -0000 1.5 +++ unpack.c 3 May 2006 09:03:21 -0000 1.6 @@ -1,4 +1,4 @@ -/* $Id: unpack.c,v 1.5 2006/03/18 17:23:49 andrew Exp $ */ +/* $Id: unpack.c,v 1.6 2006/05/03 09:03:21 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -183,7 +183,7 @@ crm_malloc0(new_graph, sizeof(crm_graph_t)); new_graph->id = -1; - new_graph->abort_priority = -1; + new_graph->abort_priority = 0; new_graph->transition_timeout = -1; if(xml_graph != NULL) { ------------------------------ _______________________________________________ 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 30, Issue 7 *******************************************