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: cts by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: linux-ha by andrew from
([email protected])
5. Linux-HA CVS: cts by zhenh from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 8 Mar 2006 15:29:22 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
Remove the digest file too
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -3 -r1.137 -r1.138
--- CM_LinuxHAv2.py.in 27 Feb 2006 09:19:42 -0000 1.137
+++ CM_LinuxHAv2.py.in 8 Mar 2006 22:29:22 -0000 1.138
@@ -138,7 +138,6 @@
self.CIBsync[node] = 1
if self.Env["CIBfilename"] == None:
self.debug("Installing Generated CIB on node %s" %(node))
- os.system("rm -f /tmp/cts.default.cib")
warnings.filterwarnings("ignore")
cib_file=os.tmpnam()
warnings.resetwarnings()
@@ -156,6 +155,7 @@
raise ValueError("Can not scp file to %s "%node)
self.rsh.remote_python_call(node, "os", "system", "chown
@HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml")
+ self.rsh.remote_python_call(node, "os", "system", "rm -f
@HA_VARLIBDIR@/heartbeat/crm/cib.xml.sig")
def prepare(self):
'''Finish the Initialization process. Prepare to test...'''
------------------------------
Message: 2
Date: Wed, 8 Mar 2006 15:30:00 -0700 (MST)
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:
Small tweak to reading XML from files
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- xml.c 16 Feb 2006 15:24:31 -0000 1.57
+++ xml.c 8 Mar 2006 22:30:00 -0000 1.58
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.57 2006/02/16 15:24:31 andrew Exp $ */
+/* $Id: xml.c,v 1.58 2006/03/08 22:30:00 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -535,10 +535,7 @@
length = ftell(input);
fseek(input, 0L, start);
- if(start != ftell(input)) {
- crm_err("fseek not behaving");
- return NULL;
- }
+ CRM_ASSERT(start == ftell(input));
crm_debug_3("Reading %d bytes from file", length);
crm_malloc0(buffer, sizeof(char) * (length+1));
@@ -672,6 +669,9 @@
{
char *buffer = NULL;
char *mutable_ptr = NULL;
+ if(an_xml_node == NULL) {
+ return NULL;
+ }
crm_malloc0(buffer, 3*get_stringlen(an_xml_node));
mutable_ptr = buffer;
------------------------------
Message: 3
Date: Wed, 8 Mar 2006 15:30:43 -0700 (MST)
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:
regression.sh
Log Message:
Remove duplicate test
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- regression.sh 10 Jan 2006 14:13:22 -0000 1.72
+++ regression.sh 8 Mar 2006 22:30:42 -0000 1.73
@@ -43,7 +43,6 @@
do_test simple11 "Priority (ne)"
do_test simple12 "Priority (eq)"
do_test simple8 "Stickiness"
-do_test simple8 "Stickiness"
echo ""
do_test date-1 "Dates"
------------------------------
Message: 4
Date: Wed, 8 Mar 2006 16:40:00 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
ConfigureMe
Log Message:
Prepare for universal binaries
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ConfigureMe 9 Nov 2005 14:20:12 -0000 1.46
+++ ConfigureMe 8 Mar 2006 23:39:59 -0000 1.47
@@ -141,11 +141,32 @@
}
ConfigureDarwin() {
- FLAGS="--disable-ldirectord --prefix=/sw --sysconfdir=/sw/etc
--localstatedir=/sw/var --with-initdir=/private/etc/mach_init.d
--enable-fatal-warnings=yes --with-group-id=65 --with-ccmuser-id=65"
+ FLAGS="--prefix=/sw --sysconfdir=/sw/etc --localstatedir=/sw/var"
+ FLAGS="$FLAGS --with-initdir=/private/etc/mach_init.d"
+ FLAGS="$FLAGS --with-group-id=65 --with-ccmuser-id=65"
+ FLAGS="$FLAGS --enable-fatal-warnings=yes"
+ FLAGS="$FLAGS --disable-ldirectord"
export CFENV="Darwin"
-# export LDFLAGS="${LDFLAGS} -bind_at_load -fno-common"
- export LIBS="$LIBS -L/usr/lib -L/sw/lib"
- export CPPFLAGS="$CPPFLAGS -I/usr/include -I/sw/usr/include -I/sw/include"
+
+# For building universal binaries
+# http://developer.apple.com/technotes/tn2005/tn2137.html
+#
+ export SDK_ROOT=/Developer/SDKs/MacOSX10.4u.sdk
+ FLAGS="$FLAGS --disable-dependency-tracking"
+ CPPFLAGS="$CPPFLAGS -isysroot $SDK_ROOT"
+
+# Need to make sure all dependancy libs are universal before this can
+# be enabled (but thats a pain so it wont happen in a hurry)
+# CPPFLAGS="$CPPFLAGS -arch ppc -arch i386"
+
+# export LDFLAGS="$LDFLAGS -Wl,-syslibroot,$SDK_ROOT"
+# only works on 32-bit platforms but this seems to be equivilent:
+# export LIBS="-L$SDK_ROOT/usr/lib -L/sw/lib $LIBS"
+
+ export LIBS="-L$SDK_ROOT/usr/lib -L/sw/lib $LIBS"
+ CPPFLAGS="$CPPFLAGS -g -I$SDK_ROOT/usr/include"
+ CPPFLAGS="$CPPFLAGS -I/sw/usr/include -I/sw/include"
+ export CPPFLAGS
}
ConfigureGenericUNIX() {
------------------------------
Message: 5
Date: Wed, 8 Mar 2006 18:30:45 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTSlab.py.in
Log Message:
make lrmadmin return everytime to avoid block
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- CTSlab.py.in 27 Feb 2006 09:19:42 -0000 1.50
+++ CTSlab.py.in 9 Mar 2006 01:30:45 -0000 1.51
@@ -75,8 +75,8 @@
self.poweroff_cmd_pat= '/usr/lib/heartbeat/stonithdtest/apitest 3 %s
4000 0'
self.lrmd_add_pat = '/usr/lib/heartbeat/lrmadmin -A %s stonith ' +
sttype + ' NULL hostlist=%s'
- self.lrmd_start_pat = '/usr/lib/heartbeat/lrmadmin -E %s start 0 0 0'
- self.lrmd_stop_pat = '/usr/lib/heartbeat/lrmadmin -E %s stop 0 0 0'
+ self.lrmd_start_pat = '/usr/lib/heartbeat/lrmadmin -E %s start 0 0
EVERYTIME'
+ self.lrmd_stop_pat = '/usr/lib/heartbeat/lrmadmin -E %s stop 0 0
EVERYTIME'
self.lrmd_del_pat = '/usr/lib/heartbeat/lrmadmin -D %s'
self.rsc_id = 'my_stonithd_id'
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 10
********************************************
