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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: heartbeat by lars from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 11 May 2006 01:02:49 -0600 (MDT)
From: [email protected]
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:
Makefile.am haclient.py.in
Added Files:
down-resource.png up-resource.png
Log Message:
move resource up or down in group in GUI
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 9 May 2006 06:03:07 -0000 1.13
+++ Makefile.am 11 May 2006 07:02:49 -0000 1.14
@@ -25,7 +25,7 @@
halib_DATA = haclient.glade ha.png login.png logout.png exit.png \
standby-node.png active-node.png add-resource.png
remove-resource.png \
start-resource.png stop-resource.png
master-resource.png slave-resource.png \
- default-resource.png
+ default-resource.png up-resource.png down-resource.png
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- haclient.py.in 11 May 2006 02:45:56 -0000 1.33
+++ haclient.py.in 11 May 2006 07:02:49 -0000 1.34
@@ -1218,6 +1218,15 @@
self.set_action_sensitive('defaultrsc',
manager.connected
and self.cur_type in [_("native"),_("group")])
+
+ self.set_action_sensitive('uprsc',
+ manager.connected
+ and self.cur_type in [_("native")])
+
+ self.set_action_sensitive('downrsc',
+ manager.connected
+ and self.cur_type in [_("native")])
+
# functions
def update(self) :
self.tree.update()
@@ -1367,6 +1376,12 @@
return
manager.do_cmd("set_target_role\n%s\n%s"%(self.cur_name,target_role))
+ def on_item_move(self, action) :
+ if action.get_name() == "uprsc" :
+ manager.do_cmd("move_rsc\n%s\nup"%self.cur_name)
+ elif action.get_name() == "downrsc" :
+ manager.do_cmd("move_rsc\n%s\ndown"%self.cur_name)
+
# constructor
def __init__(self) :
# create window
@@ -1388,6 +1403,8 @@
icons.add("ha-start-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/start-resource.png")))
icons.add("ha-stop-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/stop-resource.png")))
icons.add("ha-default-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/default-resource.png")))
+
icons.add("ha-up-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/up-resource.png")))
+
icons.add("ha-down-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/down-resource.png")))
icons.add("ha-master-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/master-resource.png")))
icons.add("ha-slave-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/slave-resource.png")))
icons.add_default()
@@ -1407,6 +1424,8 @@
<menuitem action="startrsc"/>
<menuitem action="stoprsc"/>
<menuitem action="defaultrsc"/>
+ <menuitem action="uprsc"/>
+ <menuitem action="downrsc"/>
</menu>
<menu action="node">
<menuitem action="standby"/>
@@ -1422,6 +1441,8 @@
<toolitem action="startrsc"/>
<toolitem action="stoprsc"/>
<toolitem action="defaultrsc"/>
+ <toolitem action="uprsc"/>
+ <toolitem action="downrsc"/>
<separator/>
<toolitem action="standby"/>
<toolitem action="active"/>
@@ -1442,6 +1463,8 @@
('startrsc', "ha-start-resource", _('Start'),
None,_('start resource'), self.on_item_action),
('stoprsc', "ha-stop-resource", _('Stop'), None,_('stop
resource'), self.on_item_action),
('defaultrsc', "ha-default-resource", _('Default'),
None,_('start resource automatically'), self.on_item_action),
+ ('uprsc', "ha-up-resource", _('Move Up'), None,_('move
the resource up in the group'), self.on_item_move),
+ ('downrsc', "ha-down-resource", _('Move Down'),
None,_('move the resource down in the group'), self.on_item_move),
('node', None, _('Nodes')),
('standby', "ha-standby-node", _('Standby'),
None,_('make the node standby'), self.on_standby),
('active', "ha-active-node", _('Active'), None,_('make
the node active'), self.on_active)
------------------------------
Message: 2
Date: Thu, 11 May 2006 01:32:13 -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:
complex.c
Log Message:
Parent options take precident over the child
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- complex.c 8 May 2006 07:36:01 -0000 1.85
+++ complex.c 11 May 2006 07:32:12 -0000 1.86
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.85 2006/05/08 07:36:01 andrew Exp $ */
+/* $Id: complex.c,v 1.86 2006/05/11 07:32:12 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -249,6 +249,10 @@
(*rsc)->fns = &resource_class_functions[(*rsc)->variant];
crm_debug_3("Unpacking resource...");
+
+ if(defaults != NULL) {
+ g_hash_table_foreach(defaults, dup_attr, (*rsc)->parameters);
+ }
for(lpc = 0; lpc < DIMOF(rsc_attrs); lpc++) {
value = crm_element_value(xml_obj, rsc_attrs[lpc]);
@@ -262,9 +266,6 @@
xml_obj, XML_TAG_ATTR_SETS, NULL, (*rsc)->parameters,
allowed_attrs, DIMOF(allowed_attrs), data_set);
- if(defaults != NULL) {
- g_hash_table_foreach(defaults, dup_attr, (*rsc)->parameters);
- }
(*rsc)->runnable = TRUE;
(*rsc)->provisional = TRUE;
------------------------------
Message: 3
Date: Thu, 11 May 2006 01:41:02 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
Coverity #42: Static buffer overrun in our re-transit code!
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -3 -r1.506 -r1.507
--- heartbeat.c 26 Apr 2006 03:42:07 -0000 1.506
+++ heartbeat.c 11 May 2006 07:41:01 -0000 1.507
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.c,v 1.506 2006/04/26 03:42:07 alan Exp $ */
+/* $Id: heartbeat.c,v 1.507 2006/05/11 07:41:01 lars Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -1486,12 +1486,16 @@
, hb_send_local_status, NULL, NULL);
G_main_setall_id(id, "send local status", 10+config->heartbeat_ms/2,
50);
- id=Gmain_timeout_add_full(PRI_AUDITCLIENT
- , config->initial_deadtime_ms
- , set_init_deadtime_passed_flag
- , NULL
- , NULL);
- G_main_setall_id(id, "init deadtime passed", config->warntime_ms, 50);
+ if (DoManageResources == TRUE) {
+ id=Gmain_timeout_add_full(PRI_AUDITCLIENT
+ , config->initial_deadtime_ms
+ , set_init_deadtime_passed_flag
+ , NULL
+ , NULL);
+ G_main_setall_id(id, "init deadtime passed",
config->warntime_ms, 50);
+ } else {
+ set_init_deadtime_passed_flag(NULL);
+ }
/* Dump out memory stats periodically... */
memstatsinterval = (debug_level ? 10*60*1000 : ONEDAY*1000);
@@ -5976,7 +5980,7 @@
size_t len;
if (msgslot < 0) {
- msgslot = MAXMSGHIST;
+ msgslot = MAXMSGHIST-1;
}
if (hist->msgq[msgslot] == NULL) {
continue;
@@ -6282,6 +6286,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.507 2006/05/11 07:41:01 lars
+ * Coverity #42: Static buffer overrun in our re-transit code!
+ *
* Revision 1.506 2006/04/26 03:42:07 alan
* Committed a patch from gshi which should GREATLY improve the
* behavior of autojoin code.
------------------------------
_______________________________________________
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 30
********************************************
