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: lib by andrew from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: lib by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 9 May 2006 00:34:06 -0600 (MDT)
From: [email protected]
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/common
Modified Files:
xml.c
Log Message:
Support a generic replace operation on HA_Message objects
Use it to preserve the internal XML ordering (which makes DTD validation
more liekly to be possible)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- xml.c 8 May 2006 07:42:19 -0000 1.78
+++ xml.c 9 May 2006 06:34:05 -0000 1.79
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.78 2006/05/08 07:42:19 andrew Exp $ */
+/* $Id: xml.c,v 1.79 2006/05/09 06:34:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -370,7 +370,7 @@
ret_value = NULL;
} else {
local_name = name;
- ret_value = ha_msg_new(1);
+ ret_value = ha_msg_new(3);
CRM_CHECK(ret_value != NULL, return NULL);
crm_xml_add(ret_value, F_XML_TAGNAME, name);
@@ -2053,12 +2053,15 @@
}
if(can_delete && parent != NULL) {
- crm_log_xml_debug(child, "Delete match found...");
- cl_msg_remove_value(parent, child);
- child = NULL;
- if(delete_only == FALSE) {
- add_node_copy(parent, update);
+ crm_log_xml_debug_4(child, "Delete match found...");
+ if(delete_only) {
+ cl_msg_remove_value(parent, child);
+ } else {
+ /* preserve the order */
+ cl_msg_replace_value(parent, child, update,
+ sizeof(struct ha_msg), FT_STRUCT);
}
+ child = NULL;
return TRUE;
} else if(can_delete) {
------------------------------
Message: 2
Date: Tue, 9 May 2006 00:38:41 -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:
haclient.py.in
Log Message:
adding new resouce in stopped status as default
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- haclient.py.in 9 May 2006 06:03:07 -0000 1.28
+++ haclient.py.in 9 May 2006 06:38:40 -0000 1.29
@@ -939,7 +939,7 @@
glade.get_widget("addparam"),
glade.get_widget("delparam"),
_("Add Parameter"), fields)
-
+
param_list.insert({"id":uuid(),"name":"target_role","value":"stopped"})
self.param_list = param_list
glade.get_widget("desc").set_text("")
if meta != None :
@@ -1089,6 +1089,9 @@
rsc["provider"] =
glade.get_widget("provider").child.get_text()
rsc["group"] =
glade.get_widget("group").child.get_text()
rsc["params"] =
self.param_list.get_data()
+ for param in rsc["params"] :
+ if param["name"] ==
"target_role" :
+ param["id"] =
rsc["id"]+"_target_role"
if
glade.get_widget("is_clone").get_active() :
rsc["advance"] = "clone"
elif
glade.get_widget("is_master").get_active() :
------------------------------
Message: 3
Date: Tue, 9 May 2006 00:48:25 -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:
haclient.py.in
Log Message:
set the target_role whatever the resource's current status is. change the tip
for default target_role
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- haclient.py.in 9 May 2006 06:38:40 -0000 1.29
+++ haclient.py.in 9 May 2006 06:48:24 -0000 1.30
@@ -1156,14 +1156,11 @@
self.set_action_sensitive('startrsc',
manager.connected
- and self.cur_type in [_("native")]
- and string.find(self.cur_status, _("not running")) !=
-1)
+ and self.cur_type in [_("native")])
self.set_action_sensitive('stoprsc',
manager.connected
- and self.cur_type in [_("native")]
- and string.find(self.cur_status, _("not running")) == -1
- and string.find(self.cur_status, _("running")) != -1)
+ and self.cur_type in [_("native")])
self.set_action_sensitive('defaultrsc',
manager.connected
@@ -1390,7 +1387,7 @@
('delrsc', "ha-remove-resource", _('Delete'),
None,_('delete current item'), self.on_del_item),
('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,_('default'), self.on_item_action),
+ ('defaultrsc', "ha-default-resource", _('Default'),
None,_('start resource automatically'), self.on_item_action),
('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: 4
Date: Tue, 9 May 2006 03:03:17 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/lrm
Modified Files:
raexecocf.c
Log Message:
Bug 1222 fixing - a silly bug
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecocf.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- raexecocf.c 27 Mar 2006 15:53:10 -0000 1.56
+++ raexecocf.c 9 May 2006 09:03:16 -0000 1.57
@@ -316,7 +316,7 @@
g_str_tmp = g_string_new("");
while(!feof(file)) {
memset(buff, 0, BUFF_LEN);
- read_len = fread(buff, 1, BUFF_LEN, file);
+ read_len = fread(buff, 1, BUFF_LEN - 1, file);
if (0<read_len) {
g_string_append(g_str_tmp, buff);
}
------------------------------
_______________________________________________
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 22
********************************************
