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: lrm by sunjd from ([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: mgmt by zhenh from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 9 Jun 2006 00:24:58 -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/pengine
Added Files:
unpack.h
Log Message:
New header file
------------------------------
Message: 2
Date: Fri, 9 Jun 2006 00:28:20 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
bug1301
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -3 -r1.223 -r1.224
--- lrmd.c 9 Jun 2006 05:36:55 -0000 1.223
+++ lrmd.c 9 Jun 2006 06:28:19 -0000 1.224
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.223 2006/06/09 05:36:55 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.224 2006/06/09 06:28:19 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3128,8 +3128,7 @@
op_params = ha_msg_value_str_table(op->msg, F_LRM_PARAM);
params = merge_str_tables(rsc->params,op_params);
free_str_table(op_params);
- free_str_table(rsc->params);
- ha_msg_mod_str_table(op->msg, F_LRM_PARAM, op_params);
+ ha_msg_mod_str_table(op->msg, F_LRM_PARAM, params);
op->t_perform = time_longclock();
t_stay_in_list = longclockto_ms(op->t_perform - op->t_addtolist);
@@ -3805,6 +3804,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.224 2006/06/09 06:28:19 sunjd
+ * bug1301
+ *
* Revision 1.223 2006/06/09 05:36:55 sunjd
* bug1301: donn't update rsc->params while update op->params
*
------------------------------
Message: 3
Date: Fri, 9 Jun 2006 00:42:17 -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
Added Files:
pengine.h
Log Message:
New header file
------------------------------
Message: 4
Date: Fri, 9 Jun 2006 03:24:36 -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:
1, adding empty grouip, 2,fix a bug, show empty option list when there is no
options
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- haclient.py.in 6 Jun 2006 05:06:46 -0000 1.51
+++ haclient.py.in 9 Jun 2006 09:24:35 -0000 1.52
@@ -244,12 +244,15 @@
store = None
value_cell = None
options = {}
-
+ empty_model = gtk.ListStore(str)
def on_cursor_changed(self, treeview, selection) :
(model, iter) = selection.get_selected()
name = model.get_value(iter, 0)
- if self.options != None and name in self.options.keys() :
- self.value_cell.set_property("model",
self.options[name])
+ if self.options != None :
+ if name in self.options.keys() :
+ self.value_cell.set_property("model",
self.options[name])
+ else :
+ self.value_cell.set_property("model",
self.empty_model)
def __init__(self, widget, options=None, call_back=None) :
self.widget = widget
@@ -1391,12 +1394,17 @@
def on_add_item(self, action) :
new_type = kvbox(_("The type of new item"),
[Field("type",_("Item Type"),_("native"),
- [_("native"), _("place"),_("order"),
_("colocation")])])
+ [_("native"), _("group"),
_("place"),_("order"), _("colocation")])])
if new_type == None :
return
if new_type["type"] == _("native"):
dlg = AddNativeDlg()
dlg.run()
+ elif new_type["type"] == _("group") :
+ group = kvbox(_("Add Resource
Group"),[Field("id",_("ID"),"group_")])
+ if group != None :
+ group["params"] = []
+ manager.add_group(group)
elif new_type["type"] == _("place") :
place = kvbox(_("Add Place Constraint"),
[Field("id",_("ID"),"place_",None, False),
------------------------------
Message: 5
Date: Fri, 9 Jun 2006 04:15:07 -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/admin
Modified Files:
crm_resource.c
Log Message:
Novell #183221 - Resource migration
Remove extra crud from the XML when not used
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- crm_resource.c 8 Jun 2006 13:36:37 -0000 1.36
+++ crm_resource.c 9 Jun 2006 10:15:06 -0000 1.37
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.36 2006/06/08 13:36:37 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.37 2006/06/09 10:15:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -439,7 +439,7 @@
crm_free(id);
id = crm_concat("cli-standby", rsc_id, '-');
- dont_run = create_xml_node(constraints, XML_CONS_TAG_RSC_LOCATION);
+ dont_run = create_xml_node(NULL, XML_CONS_TAG_RSC_LOCATION);
crm_xml_add(dont_run, XML_ATTR_ID, id);
crm_free(id);
@@ -487,6 +487,8 @@
crm_xml_add(expr, XML_EXPR_ATTR_OPERATION, "eq");
crm_xml_add(expr, XML_EXPR_ATTR_VALUE, existing_node);
crm_xml_add(expr, XML_EXPR_ATTR_TYPE, "string");
+
+ add_node_copy(constraints, dont_run);
}
if(preferred_node == NULL) {
@@ -527,6 +529,7 @@
}
free_xml(fragment);
+ free_xml(dont_run);
return rc;
}
@@ -560,7 +563,6 @@
{"un-migrate", 0, 0, 'U'},
{"resource", 1, 0, 'r'},
{"host-uname", 1, 0, 'H'},
- {"host-uuid", 1, 0, 'h'},
{"force", 0, 0, 'f'},
{"set-parameter", 1, 0, 'p'},
@@ -701,11 +703,6 @@
host_uname = optarg;
break;
- case 'h':
- crm_debug_2("Option %c => %s", flag, optarg);
- host_id = crm_strdup(optarg);
- break;
-
default:
fprintf(stderr, "Argument code 0%o (%c) is not
(?yet?) supported\n", flag, flag);
++argerr;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 30
********************************************
