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: heartbeat by lars from
([email protected])
2. Linux-HA CVS: tools by zhenh from
([email protected])
3. Linux-HA CVS: membership by zhenh from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 11 Apr 2006 16:11:18 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
config.c
Log Message:
CID 5: If we return here, the deallocation codepath at the end of the
function doesn't make sense, and we would leak memory.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -3 -r1.195 -r1.196
--- config.c 10 Apr 2006 12:50:08 -0000 1.195
+++ config.c 11 Apr 2006 22:11:17 -0000 1.196
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.195 2006/04/10 12:50:08 andrew Exp $ */
+/* $Id: config.c,v 1.196 2006/04/11 22:11:17 lars Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -2310,7 +2310,7 @@
cl_log(LOG_ERR
, "Duplicate %s directive for API client %s: [%s]"
, KEY_APIPERM, clname, directive);
- return HA_FAIL;
+ goto baddirective;
}
g_hash_table_insert(APIAuthorization, clname, auth);
if (DEBUGDETAILS) {
@@ -2520,6 +2520,10 @@
/*
* $Log: config.c,v $
+ * Revision 1.196 2006/04/11 22:11:17 lars
+ * CID 5: If we return here, the deallocation codepath at the end of the
+ * function doesn't make sense, and we would leak memory.
+ *
* Revision 1.195 2006/04/10 12:50:08 andrew
* Untested pingd - replacement for ipfail
*
------------------------------
Message: 2
Date: Tue, 11 Apr 2006 23:55:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
haresources2cib.py.in
Log Message:
add reminder to user about the lcoation and permission of cib.xml
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- haresources2cib.py.in 17 Mar 2006 18:01:07 -0000 1.8
+++ haresources2cib.py.in 12 Apr 2006 05:55:33 -0000 1.9
@@ -396,7 +396,7 @@
group_index += 1
id_index += len(fields)
else :
- print "can not parse this line:"+line
+ sys.stderr.write("can not parse this line:"+line+"\n")
if enable_stonith :
node_num = 0
for nodes in node_list :
@@ -406,3 +406,7 @@
id_index += 1
print cib[0].toprettyxml()
+ sys.stderr.write("Notice:\n")
+ sys.stderr.write("Please move the cib.xml generated to
/var/lib/heartbeat/crm/.\n")
+ sys.stderr.write("It must be owned and read/writeable by user @[EMAIL
PROTECTED]")
+ sys.stderr.write("Or owned and read/writable by group @[EMAIL
PROTECTED]")
------------------------------
Message: 3
Date: Wed, 12 Apr 2006 01:08:16 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccm_statemachine.c
Log Message:
the timeout of 9*keepalive is unnecessary long, if we find 5*keepalive is not
enough in the test, we can roll it back
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccm_statemachine.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ccm_statemachine.c 17 Mar 2006 23:10:38 -0000 1.18
+++ ccm_statemachine.c 12 Apr 2006 07:08:15 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: ccm_statemachine.c,v 1.18 2006/03/17 23:10:38 lars Exp $ */
+/* $Id: ccm_statemachine.c,v 1.19 2006/04/12 07:08:15 zhenh Exp $ */
/*
* ccm.c: Consensus Cluster Service Program
*
@@ -206,7 +206,7 @@
ccm_debug2(LOG_DEBUG, "ccm_configure_timeout "
"keepalive=%ld", keepalive);
- CCM_TMOUT_SET_U(info, 9*keepalive);
+ CCM_TMOUT_SET_U(info, 5*keepalive);
CCM_TMOUT_SET_LU(info, 30*keepalive);
CCM_TMOUT_SET_VRS(info, 9*keepalive);
CCM_TMOUT_SET_ITF(info, 18*keepalive);
------------------------------
Message: 4
Date: Wed, 12 Apr 2006 02:22:52 -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:
xml_diff.c
Log Message:
Fix for CID11 - using the wrong variable in the if-statement
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/xml_diff.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- xml_diff.c 23 Jan 2006 16:07:02 -0000 1.7
+++ xml_diff.c 12 Apr 2006 08:22:50 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Id: xml_diff.c,v 1.7 2006/01/23 16:07:02 andrew Exp $ */
+/* $Id: xml_diff.c,v 1.8 2006/04/12 08:22:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -189,7 +189,7 @@
fprintf(stderr, "Input second XML fragment:");
object_2 = stdin2xml();
- } else if(xml_file_1 != NULL) {
+ } else if(xml_file_2 != NULL) {
FILE *xml_strm = fopen(xml_file_2, "r");
if(xml_strm != NULL) {
crm_debug("Reading: %s", xml_file_2);
------------------------------
Message: 5
Date: Wed, 12 Apr 2006 02:23:41 -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
Modified Files:
native.c
Log Message:
Fix for CID 30 - possible use of NULL
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- native.c 11 Apr 2006 07:27:20 -0000 1.126
+++ native.c 12 Apr 2006 08:23:41 -0000 1.127
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.126 2006/04/11 07:27:20 andrew Exp $ */
+/* $Id: native.c,v 1.127 2006/04/12 08:23:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1491,21 +1491,21 @@
return FALSE;
}
- if(color_lh->details->pending
- && color_rh->details->pending) {
+ if(color_lh == NULL && color_rh == NULL) {
+ return matched;
+
+ } else if(color_lh == NULL || color_rh == NULL) {
+ return !matched;
+
+ } else if(color_lh->details->pending
+ && color_rh->details->pending) {
candidate_nodes_lh = color_lh->details->candidate_nodes;
candidate_nodes_rh = color_rh->details->candidate_nodes;
} else if(color_lh->details->pending == FALSE
&& color_rh->details->pending == FALSE) {
- if(color_lh == NULL && color_rh == NULL) {
- return matched;
-
- } else if(color_lh == NULL || color_rh == NULL) {
- return !matched;
-
- } else if(color_lh->details->chosen_node == NULL
+ if(color_lh->details->chosen_node == NULL
&& color_rh->details->chosen_node == NULL) {
return matched;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 75
********************************************
