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: include by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by lars from (linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: resources by lars from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Jul 2006 08:07:43 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
util.h
Log Message:
Split some monolithic functions into smaller pieces
Abstract out common actions from the CIB worker functions
Some extra helper functions for dealing with memory statistics
Selectivly disable memory statistic tracking in the CIB so that we can
check if it leaks (regardless of how the contents of the CIB changes).
Some (disabled) code for fingering the messaging code as the source of
CIB memory leaks.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- util.h 5 May 2006 13:16:02 -0000 1.35
+++ util.h 4 Jul 2006 14:07:43 -0000 1.36
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.35 2006/05/05 13:16:02 andrew Exp $ */
+/* $Id: util.h,v 1.36 2006/07/04 14:07:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -94,6 +94,10 @@
extern void crm_zero_mem_stats(volatile cl_mem_stats_t *stats);
+extern void crm_save_mem_stats(const char *location, cl_mem_stats_t
*saved_stats);
+
+extern gboolean crm_diff_mem_stats(int log_level, const char *location,
cl_mem_stats_t *saved_stats);
+
extern char *generate_transition_magic_v202(
const char *transition_key, int op_status);
------------------------------
Message: 2
Date: Tue, 4 Jul 2006 08:11:11 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_verify.c
Log Message:
Make #1162 reproducible again, so the memory leak can be debugged.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- crm_verify.c 21 Jun 2006 08:40:13 -0000 1.15
+++ crm_verify.c 4 Jul 2006 14:11:11 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.15 2006/06/21 08:40:13 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.16 2006/07/04 14:11:11 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -228,6 +228,7 @@
cleanup_alloc_calculations(&data_set);
+#if 0
if(USE_LIVE_CIB) {
/* Calling msg2ipcchan() seems to initialize something
* which isn't free'd when we disconnect and free the
@@ -237,7 +238,8 @@
volatile cl_mem_stats_t *active_stats = cl_malloc_getstats();
active_stats->numfree++;
}
-
+#endif
+
CRM_CHECK(crm_mem_stats(NULL) == FALSE, ; );
if(was_config_error) {
------------------------------
Message: 3
Date: Tue, 4 Jul 2006 08:59:49 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
IPaddr.in IPaddr2.in
Log Message:
The IPaddr2 agent was missing the conditional special handling for
removing & restoring IP addresses on loopback, for the rare case of
being used with LVS DR. But, this breaks BSC, which tries to use an IP
on lo as a regular test.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- IPaddr.in 26 Jun 2006 05:46:44 -0000 1.43
+++ IPaddr.in 4 Jul 2006 14:59:48 -0000 1.44
@@ -133,9 +133,12 @@
<parameter name="lvs_support">
<longdesc lang="en">
-Enable support for LVS. Allows stopped IPs to exist on the loopback device or
something like that"
+Enable support for LVS Direct Routing configurations. In case a IP
+address is stopped, only move it to the loopback device to allow the
+local node to continue to service requests, but no longer advertise it
+on the network.
</longdesc>
-<shortdesc lang="en">Enable support for LVS</shortdesc>
+<shortdesc lang="en">Enable support for LVS DR</shortdesc>
<content type="boolean" default="false"/>
</parameter>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr2.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- IPaddr2.in 12 Jun 2006 15:31:25 -0000 1.20
+++ IPaddr2.in 4 Jul 2006 14:59:48 -0000 1.21
@@ -1,16 +1,14 @@
#!/bin/sh
#
-# $Id: IPaddr2.in,v 1.20 2006/06/12 15:31:25 alan Exp $
+# $Id: IPaddr2.in,v 1.21 2006/07/04 14:59:48 lars Exp $
#
# OCF Resource Agent compliant IPaddr2 script.
#
# Based on work by Tuomo Soini, ported to the OCF RA API by Lars
# Marowsky-Brée. Implements Cluster Alias IP functionality too.
#
-# WARNING: Untested so far!
-#
# Copyright (c) 2003 Tuomo Soini
-# Copyright (c) 2004 SUSE LINUX AG, Lars Marowsky-Brée
+# Copyright (c) 2004-2006 SUSE LINUX AG, Lars Marowsky-Brée
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify
@@ -36,7 +34,7 @@
# TODO:
-# - Implement Cluster IP functionality
+# - Fix up Cluster IP functionality
# - There ought to be an ocf_run_cmd function which does all logging,
# timeout handling etc for us
# - Make this the standard IP address agent on Linux; the other
@@ -145,6 +143,17 @@
<content type="string" default=""/>
</parameter>
+<parameter name="lvs_support">
+<longdesc lang="en">
+Enable support for LVS Direct Routing configurations. In case a IP
+address is stopped, only move it to the loopback device to allow the
+local node to continue to service requests, but no longer advertise it
+on the network.
+</longdesc>
+<shortdesc lang="en">Enable support for LVS DR</shortdesc>
+<content type="boolean" default="false"/>
+</parameter>
+
<parameter name="incarnations_max_global">
<longdesc lang="en">
If you wish the IP address to be active on more than one node, set this
@@ -264,6 +273,15 @@
IFLABEL="$OCF_RESKEY_iflabel"
IF_MAC="$OCF_RESKEY_mac"
+ LVS_SUPPORT=0
+ if [ $SYSTYPE = "Linux" -o $SYSTYPE = "SunOS" ]; then
+ if [ x"${OCF_RESKEY_lvs_support}" = x"true" \
+ -o x"${OCF_RESKEY_lvs_support}" = x"on" \
+ -o x"${OCF_RESKEY_lvs_support}" = x"1" ]; then
+ LVS_SUPPORT=1
+ fi
+ fi
+
IP_INC_GLOBAL=${OCF_RESKEY_incarnations_max_global:-1}
IP_INC_NO=${OCF_RESKEY_incarnation_no:-0}
IP_CIP_HASH="$OCF_RESKEY_clusterip_hash"
@@ -508,15 +526,22 @@
#
ip_served() {
case `find_interface $BASEIP` in
- lo|"") echo "no"
+ lo*) if [ "$LVS_SUPPORT" = "1" ]; then
+ echo "no"
+ return 0
+ fi
+ ;;
+ "") echo "no"
return 0
;;
+ *) if [ -z "$IP_CIP" ]; then
+ echo "ok"
+ return 0
+ fi
+ ;;
esac
- if [ -z "$IP_CIP" ]; then
- echo "ok"
- return 0
- fi
+ # Special handling for the CIP:
if grep -q "\<${IP_INC_NO}\>" $IP_CIP_FILE ; then
echo "ok"
@@ -578,12 +603,13 @@
fi
if [ "$ip_status" = "no" ]; then
- # TODO: Needs to be an instance parameter!
- case `find_interface $BASEIP` in
- lo)
- remove_conflicting_loopback $BASEIP 32 255.255.255.255
lo
- ;;
- esac
+ if [ "$LVS_SUPPORT" = "1" ]; then
+ case `find_interface $BASEIP` in
+ lo*)
+ remove_conflicting_loopback $BASEIP 32
255.255.255.255 lo
+ ;;
+ esac
+ fi
add_interface $BASEIP $NETMASK $BRDCAST $NIC $IFLABEL
@@ -650,8 +676,10 @@
if [ $? -ne 0 ]; then
exit $OCF_ERR_GENERIC
fi
-
- restore_loopback "$BASEIP"
+
+ if [ "$LVS_SUPPORT" = 1 ]; then
+ restore_loopback "$BASEIP"
+ fi
fi
exit $OCF_SUCCESS
------------------------------
_______________________________________________
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 32, Issue 8
*******************************************
