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: lib by andrew 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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 19 Jun 2006 03:34:39 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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
Modified Files:
unpack.c
Log Message:
modify debug logging now that it works as desired
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- unpack.c 16 Jun 2006 09:29:10 -0000 1.5
+++ unpack.c 19 Jun 2006 09:34:38 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.5 2006/06/16 09:29:10 andrew Exp $ */
+/* $Id: unpack.c,v 1.6 2006/06/19 09:34:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -635,7 +635,7 @@
rsc = pe_find_resource(data_set->resources, alt_rsc_id);
/* no match */
if(rsc == NULL) {
- crm_err("%s not found: %d", alt_rsc_id, is_duped_clone);
+ crm_debug_2("%s not found: %d", alt_rsc_id,
is_duped_clone);
if(is_duped_clone) {
/* create one */
rsc = create_fake_resource(alt_rsc_id,
rsc_entry, data_set);
------------------------------
Message: 2
Date: Mon, 19 Jun 2006 04:25:27 -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:
force garbage collect for each update, reduce the memory usage
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- haclient.py.in 19 Jun 2006 08:02:43 -0000 1.66
+++ haclient.py.in 19 Jun 2006 10:25:27 -0000 1.67
@@ -24,7 +24,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-import sys, os, string, socket, syslog, webbrowser, pickle, xml
+import sys, os, string, socket, syslog, webbrowser, pickle, xml, gc
from xml.dom.minidom import parseString
import locale, gettext
@@ -1826,6 +1826,7 @@
def update(self) :
self.cache_clear()
window.update()
+ gc.collect()
self.update_timer = -1
# cluster functions
@@ -2199,6 +2200,7 @@
if not pygtk_2_4_newer () :
print "the pygtk 2.4 or newer is needed."
sys.exit()
+ gc.enable()
syslog.openlog("haclient", 0, syslog.LOG_USER)
locale.setlocale(locale.LC_ALL, '')
gettext.bindtextdomain(app_name)
------------------------------
Message: 3
Date: Mon, 19 Jun 2006 04:47:31 -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:
regression.sh allocate.c
Log Message:
Serialize all fencing operations because the stonithd cant handle it on its own
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- regression.sh 16 Jun 2006 11:03:56 -0000 1.86
+++ regression.sh 19 Jun 2006 10:47:31 -0000 1.87
@@ -142,6 +142,7 @@
do_test rec-node-11 "Node Recover - CRM down w/ group - fence "
do_test rec-node-12 "Node Recover - nothing active - fence "
do_test rec-node-13 "Node Recover - failed resource + shutdown - fence "
+do_test rec-node-14 "Serialize all stonith's"
echo ""
do_test multi1 "Multiple Active (stop/start)"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/allocate.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- allocate.c 16 Jun 2006 08:09:09 -0000 1.6
+++ allocate.c 19 Jun 2006 10:47:31 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: allocate.c,v 1.6 2006/06/16 08:09:09 andrew Exp $ */
+/* $Id: allocate.c,v 1.7 2006/06/19 10:47:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -651,6 +651,7 @@
{
action_t *dc_down = NULL;
action_t *stonith_op = NULL;
+ action_t *last_stonith = NULL;
gboolean integrity_lost = FALSE;
crm_debug_3("Processing fencing and shutdown cases");
@@ -685,6 +686,12 @@
if(node->details->is_dc) {
dc_down = stonith_op;
+
+ } else {
+ if(last_stonith) {
+ order_actions(last_stonith, stonith_op,
pe_ordering_manditory);
+ }
+ last_stonith = stonith_op;
}
} else if(node->details->online && node->details->shutdown) {
@@ -723,7 +730,6 @@
if(dc_down != NULL) {
GListPtr shutdown_matches = find_actions(
data_set->actions, CRM_OP_SHUTDOWN, NULL);
-
crm_debug_2("Ordering shutdowns before %s on %s (DC)",
dc_down->task, dc_down->node->details->uname);
@@ -741,6 +747,10 @@
order_actions(node_stop, dc_down,
pe_ordering_manditory);
);
+
+ if(last_stonith && dc_down != last_stonith) {
+ order_actions(last_stonith, dc_down,
pe_ordering_manditory);
+ }
}
return TRUE;
@@ -770,7 +780,6 @@
if(rsc != NULL) {
rsc->cmds->rsc_order_lh(rsc, order);
continue;
-
}
/* try action-to-rsc_action */
------------------------------
Message: 4
Date: Mon, 19 Jun 2006 04:47:31 -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/testcases
Added Files:
rec-node-14.dot rec-node-14.exp rec-node-14.xml
Log Message:
Serialize all fencing operations because the stonithd cant handle it on its own
------------------------------
Message: 5
Date: Mon, 19 Jun 2006 04:56:51 -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_mon.c
Log Message:
Dont unconditionally call ncurses functions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- crm_mon.c 16 Jun 2006 10:00:17 -0000 1.27
+++ crm_mon.c 19 Jun 2006 10:56:50 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.27 2006/06/16 10:00:17 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.28 2006/06/19 10:56:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -471,7 +471,11 @@
);
}
- refresh();
+#if CURSES_ENABLED
+ if(as_console) {
+ refresh();
+ }
+#endif
data_set.input = NULL;
cleanup_calculations(&data_set);
return 0;
------------------------------
_______________________________________________
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 31, Issue 60
********************************************
