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: mgmt by zhenh from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: tools 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: heartbeat by msoffen from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Tue, 16 May 2006 08:46:18 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : zhenh Host : Project : linux-ha Module : mgmt Dir : linux-ha/mgmt/client Modified Files: haclient.glade haclient.py.in Log Message: double click on the type will show the detail in the add new resource dialog =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.glade,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- haclient.glade 16 May 2006 05:35:20 -0000 1.11 +++ haclient.glade 16 May 2006 14:46:17 -0000 1.12 @@ -2119,7 +2119,7 @@ <child> <widget class="GtkLabel" id="label201"> <property name="visible">True</property> - <property name="label" translatable="yes">Type:</property> + <property name="label" translatable="yes">Type(double click for detail):</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- haclient.py.in 16 May 2006 08:43:21 -0000 1.40 +++ haclient.py.in 16 May 2006 14:46:17 -0000 1.41 @@ -1011,6 +1011,16 @@ def on_type_changed(self, type_list) : self.update_param_list() + + def on_type_list_click(self, type_list, event) : + if event.type == gtk.gdk._2BUTTON_PRESS : + (cur_class, cur_type, cur_provider) = self.get_cur_select() + meta = manager.get_rsc_meta(cur_class, cur_type, cur_provider) + if meta != None : + msgbox (meta.longdesc) + + + def init_type_list(self): add_column(self.type_list, _("Name"), 0) add_column(self.type_list, _("Provider"), 1) @@ -1029,7 +1039,7 @@ desc = "" meta = manager.get_rsc_meta(c,t,p) if meta != None : - desc = meta.desc + desc = meta.shortdesc if c=="heartbeat" : p = "(heartbeat)" elif c=="stonith" : @@ -1049,6 +1059,7 @@ dialog.vbox.add(layout) self.type_list = glade.get_widget("types") self.type_list.connect("cursor-changed", self.on_type_changed) + self.type_list.connect("event", self.on_type_list_click) self.init_type_list() glade.get_widget("is_clone").connect("toggled", self.on_clone_changed, glade) @@ -1808,10 +1819,15 @@ version_xml = doc_xml.getElementsByTagName("version")[0] meta.version = version_xml.childNodes[0].data - meta.desc = "" + meta.longdesc = "" desc_xml = doc_xml.getElementsByTagName("longdesc") if desc_xml != [] and desc_xml[0] in doc_xml.childNodes : - meta.desc = desc_xml[0].childNodes[0].data + meta.longdesc = desc_xml[0].childNodes[0].data + + meta.shortdesc = "" + desc_xml = doc_xml.getElementsByTagName("shortdesc") + if desc_xml != [] and desc_xml[0] in doc_xml.childNodes : + meta.shortdesc = desc_xml[0].childNodes[0].data meta.parameters = [] for param_xml in doc_xml.getElementsByTagName("parameter") : ------------------------------ Message: 2 Date: Tue, 16 May 2006 08:46:25 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : tools Dir : linux-ha/tools Modified Files: attrd.c pingd.c Log Message: Novell #176014: wait longer before declaring attrd/pingd unable to connect =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/tools/attrd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- attrd.c 9 May 2006 09:18:17 -0000 1.6 +++ attrd.c 16 May 2006 14:46:25 -0000 1.7 @@ -1,4 +1,4 @@ -/* $Id: attrd.c,v 1.6 2006/05/09 09:18:17 andrew Exp $ */ +/* $Id: attrd.c,v 1.7 2006/05/16 14:46:25 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -398,14 +398,14 @@ if(was_err == FALSE) { int lpc = 0; - int max_retry = 10; + int max_retry = 20; enum cib_errors rc = cib_not_connected; cib_conn = cib_new(); for(lpc = 0; lpc < max_retry && rc != cib_ok; lpc++) { crm_debug("CIB signon attempt %d", lpc); rc = cib_conn->cmds->signon( cib_conn, T_ATTRD, cib_command); - sleep(2); + sleep(5); } if(rc != cib_ok) { crm_err("Signon to CIB failed: %s", =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/tools/pingd.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- pingd.c 9 May 2006 09:17:35 -0000 1.3 +++ pingd.c 16 May 2006 14:46:25 -0000 1.4 @@ -1,4 +1,4 @@ -/* $Id: pingd.c,v 1.3 2006/05/09 09:17:35 andrew Exp $ */ +/* $Id: pingd.c,v 1.4 2006/05/16 14:46:25 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -318,7 +318,7 @@ for(lpc = 0; attrd == NULL && lpc < 30; lpc++) { crm_debug("attrd registration attempt: %d", lpc); - sleep(2); + sleep(5); attrd = init_client_ipc_comms_nodispatch(T_ATTRD); } ------------------------------ Message: 3 Date: Tue, 16 May 2006 09:25:19 -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: Allow deletions to be forced in no-quorum cases =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- crm_resource.c 16 May 2006 12:41:28 -0000 1.29 +++ crm_resource.c 16 May 2006 15:25:19 -0000 1.30 @@ -1,4 +1,4 @@ -/* $Id: crm_resource.c,v 1.29 2006/05/16 12:41:28 andrew Exp $ */ +/* $Id: crm_resource.c,v 1.30 2006/05/16 15:25:19 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -917,18 +917,22 @@ } else if(rsc_cmd == 'D') { crm_data_t *msg_data = NULL; - + int cib_options = cib_sync_call; + CRM_CHECK(rsc_id != NULL, return cib_NOTEXISTS); if(rsc_type == NULL) { fprintf(stderr, "You need to specify a resource type with -t"); return cib_NOTEXISTS; } + if(do_force) { + cib_options |= cib_scope_local|cib_quorum_override; + } msg_data = create_xml_node(NULL, rsc_type); crm_xml_add(msg_data, XML_ATTR_ID, rsc_id); rc = cib_conn->cmds->delete(cib_conn, XML_CIB_TAG_RESOURCES, - msg_data, NULL, cib_sync_call); + msg_data, NULL, cib_options); free_xml(msg_data); } else { ------------------------------ Message: 4 Date: Tue, 16 May 2006 10:30:54 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by msoffen from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : msoffen Host : Project : linux-ha Module : heartbeat Dir : linux-ha/heartbeat/lib Modified Files: ha_propagate.in Log Message: Fixed python to use autoconf variable. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/ha_propagate.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ha_propagate.in 4 May 2006 15:53:24 -0000 1.1 +++ ha_propagate.in 16 May 2006 16:30:54 -0000 1.2 @@ -1,4 +1,4 @@ -#!/usr/bin/python [EMAIL PROTECTED]@ # # Support: [EMAIL PROTECTED] # License: GNU General Public License (GPL) ------------------------------ _______________________________________________ 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 50 ********************************************