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 panjiam from
([email protected])
2. Linux-HA CVS: cts by panjiam from
([email protected])
3. Linux-HA CVS: fencing by sunjd from
([email protected])
4. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 27 Mar 2006 00:15:30 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTS.py.in CTSproxy.py.in
Log Message:
replaced base64 with binascii to avoid '\n' in encoded strings
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTS.py.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- CTS.py.in 13 Mar 2006 09:37:50 -0000 1.52
+++ CTS.py.in 27 Mar 2006 07:15:29 -0000 1.53
@@ -32,7 +32,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import types, string, select, sys, time, re, os, struct, os, signal
-import base64, pickle
+import base64, pickle, binascii
from UserDict import UserDict
from syslog import *
from popen2 import Popen3
@@ -153,11 +153,11 @@
If the call success, lastrc == 0 and return result.
If the call fail, lastrc == 1 and return the reason (string)
'''
- encode_args = base64.encodestring(pickle.dumps(args))
+ encode_args = binascii.b2a_base64(pickle.dumps(args))
result = self.readaline(node, \
string.join(["@libdir@/heartbeat/cts/CTSproxy.py",module,func,encode_args]))
if self.lastrc == 0 :
- return pickle.loads(base64.decodestring(result))
+ return pickle.loads(binascii.a2b_base64(result))
return result
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSproxy.py.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- CTSproxy.py.in 10 Aug 2005 07:43:50 -0000 1.1
+++ CTSproxy.py.in 27 Mar 2006 07:15:29 -0000 1.2
@@ -25,7 +25,7 @@
#
-import sys, pickle, base64
+import sys, pickle, base64, binascii
# check the number of arguments
if len(sys.argv) != 4 :
@@ -48,7 +48,7 @@
# unpack the arguments of functions
try :
- args = pickle.loads(base64.decodestring(sys.argv[3]))
+ args = pickle.loads(binascii.a2b_base64(sys.argv[3]))
except IndexError:
print "can not unpickle args %s"%sys.argv[3]
sys.exit(1)
@@ -56,7 +56,7 @@
# call the function and return packed result
try :
result = apply(func,args)
- print base64.encodestring(pickle.dumps(result))
+ print binascii.b2a_base64(pickle.dumps(result))
sys.exit(0)
except TypeError:
print "parameter error"
------------------------------
Message: 2
Date: Mon, 27 Mar 2006 00:26:35 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
we can't ensure the uid on the monitor machin euqals the uid on the test machin
for the same user, bug #1147
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- CM_LinuxHAv2.py.in 26 Mar 2006 03:48:25 -0000 1.141
+++ CM_LinuxHAv2.py.in 27 Mar 2006 07:26:34 -0000 1.142
@@ -154,7 +154,7 @@
"root@" + (self["CIBfile"]%node)):
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", "chown
@HA_CCMUSER@ @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):
------------------------------
Message: 3
Date: Mon, 27 Mar 2006 00:33:40 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
GSource will free it when return FALSE
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- stonithd.c 17 Mar 2006 09:26:37 -0000 1.86
+++ stonithd.c 27 Mar 2006 07:33:40 -0000 1.87
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.86 2006/03/17 09:26:37 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.87 2006/03/27 07:33:40 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -1234,7 +1234,6 @@
if (NULL !=
(timer_id=g_hash_table_lookup(reboot_blocked_table, target))) {
- Gmain_timeout_remove(*timer_id);
g_hash_table_remove(reboot_blocked_table, target);
stonithd_log(LOG_INFO, "Unblock the reboot to node %s", target);
} else {
@@ -3421,6 +3420,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.87 2006/03/27 07:33:40 sunjd
+ * GSource will free it when return FALSE
+ *
* Revision 1.86 2006/03/17 09:26:37 sunjd
* - Bug 1036, memory leak
* - Make code more safe on memory using
------------------------------
Message: 4
Date: Mon, 27 Mar 2006 00:33:48 -0700 (MST)
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/daemon
Modified Files:
mgmt_crm.c
Log Message:
not running not equal to failure
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- mgmt_crm.c 27 Mar 2006 05:48:13 -0000 1.16
+++ mgmt_crm.c 27 Mar 2006 07:33:47 -0000 1.17
@@ -797,11 +797,14 @@
ret = mgmt_msg_append(ret, "unmanaged");
break;
}
- if( rsc->failed
- ||g_list_length(rsc->running_on) == 0) {
+ if( rsc->failed ) {
ret = mgmt_msg_append(ret, "failed");
break;
}
+ if( g_list_length(rsc->running_on) == 0) {
+ ret = mgmt_msg_append(ret, "not running");
+ break;
+ }
if( g_list_length(rsc->running_on) > 1) {
ret = mgmt_msg_append(ret, "multi-running");
break;
------------------------------
_______________________________________________
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 67
********************************************
