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: debian by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 24 May 2006 09:16:51 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
heartbeat-2.files
Log Message:
add cleanup-resource.png
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- heartbeat-2.files 11 May 2006 07:02:48 -0000 1.15
+++ heartbeat-2.files 24 May 2006 15:16:50 -0000 1.16
@@ -52,6 +52,7 @@
usr/lib/heartbeat/ccm_testclient
usr/lib/heartbeat/cib
usr/lib/heartbeat/cibmon
+usr/lib/heartbeat/cleanup-resource.png
usr/lib/heartbeat/clmtest
usr/lib/heartbeat/crm.dtd
usr/lib/heartbeat/crmd
------------------------------
Message: 2
Date: Wed, 24 May 2006 09:16:51 -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:
Makefile.am
Added Files:
cleanup-resource.png
Log Message:
add cleanup-resource.png
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 11 May 2006 07:02:49 -0000 1.14
+++ Makefile.am 24 May 2006 15:16:50 -0000 1.15
@@ -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 up-resource.png down-resource.png
+ default-resource.png up-resource.png
down-resource.png cleanup-resource.png
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
------------------------------
Message: 3
Date: Wed, 24 May 2006 09:18:19 -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.py.in
Log Message:
add cleanup resource action
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- haclient.py.in 24 May 2006 08:20:19 -0000 1.44
+++ haclient.py.in 24 May 2006 15:18:19 -0000 1.45
@@ -1232,10 +1232,14 @@
and string.find(self.cur_status, _("standby")) != -1
and string.find(self.cur_status, _("running")) != -1)
- self.set_action_sensitive('startrsc',
+ self.set_action_sensitive('cleanuprsc',
manager.connected
and self.cur_type in [_("native"),_("group")])
+ self.set_action_sensitive('startrsc',
+ manager.connected
+ and self.cur_type in [_("native"),_("group")])
+
self.set_action_sensitive('stoprsc',
manager.connected
and self.cur_type in [_("native"),_("group")])
@@ -1372,11 +1376,7 @@
def on_del_item(self, action) :
if confirmbox(_("Delete") + " "+self.cur_type + " " +
self.cur_name + "?"):
if self.cur_type in
[_("native"),_("group"),_("clone"),_("master")] :
- if string.find(self.cur_status, _("unmanaged"))
!= -1 :
- hostname =
manager.get_rsc_running_on(self.cur_name)
-
manager.do_cmd("cleanup_rsc\n"+hostname[0] + "\n" + self.cur_name)
- else :
-
manager.do_cmd("del_rsc\n"+self.cur_name)
+ manager.do_cmd("del_rsc\n"+self.cur_name)
elif self.cur_type == _("place") :
manager.do_cmd("del_co\nrsc_location\n"+self.cur_name)
elif self.cur_type == _("order") :
@@ -1406,7 +1406,11 @@
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)
-
+
+ def on_item_cleanup(self, action) :
+ hostname = manager.get_rsc_running_on(self.cur_name)
+ manager.do_cmd("cleanup_rsc\n"+hostname[0] + "\n" +
self.cur_name)
+
# constructor
def __init__(self) :
# create window
@@ -1427,6 +1431,7 @@
icons.add("ha-remove-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/remove-resource.png")))
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-cleanup-resource",gtk.IconSet(gtk.gdk.pixbuf_new_from_file("@libdir@/heartbeat/cleanup-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")))
@@ -1446,6 +1451,7 @@
<menu action="resource">
<menuitem action="addrsc"/>
<menuitem action="delrsc"/>
+ <menuitem action="cleanuprsc"/>
<menuitem action="startrsc"/>
<menuitem action="stoprsc"/>
<menuitem action="defaultrsc"/>
@@ -1460,6 +1466,7 @@
<popup name="resource_popup">
<menuitem action="addrsc"/>
<menuitem action="delrsc"/>
+ <menuitem action="cleanuprsc"/>
<menuitem action="startrsc"/>
<menuitem action="stoprsc"/>
<menuitem action="defaultrsc"/>
@@ -1481,6 +1488,7 @@
<separator/>
<toolitem action="addrsc"/>
<toolitem action="delrsc"/>
+ <toolitem action="cleanuprsc"/>
<toolitem action="startrsc"/>
<toolitem action="stoprsc"/>
<toolitem action="defaultrsc"/>
@@ -1503,6 +1511,7 @@
('resource', None, _('Resources')),
('addrsc', "ha-add-resource", _('Add New Item'),
None,_('add new item'), self.on_add_item),
('delrsc', "ha-remove-resource", _('Delete'),
None,_('delete current item'), self.on_del_item),
+ ('cleanuprsc', "ha-cleanup-resource", _('Clean up'),
None,_('refresh the resource'), self.on_item_action),
('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,_('work as default'), self.on_item_action),
------------------------------
Message: 4
Date: Wed, 24 May 2006 10:07:24 -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:
Notify attributes should also be in the meta namespace
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- native.c 24 May 2006 10:11:18 -0000 1.138
+++ native.c 24 May 2006 16:07:24 -0000 1.139
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.138 2006/05/24 10:11:18 andrew Exp $ */
+/* $Id: native.c,v 1.139 2006/05/24 16:07:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1738,7 +1738,8 @@
static void dup_attr(gpointer key, gpointer value, gpointer user_data)
{
- g_hash_table_replace(user_data, crm_strdup(key), crm_strdup(value));
+ char *meta_key = crm_concat(CRM_META, key, '_');
+ g_hash_table_replace(user_data, meta_key, crm_strdup(value));
}
static action_t *
------------------------------
_______________________________________________
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 75
********************************************
