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: resources by davidlee from
([email protected])
2. Linux-HA CVS: heartbeat by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 20 Apr 2006 10:33:24 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
IPaddr.in
Log Message:
'findif' invocation needs base interface (e.g. 'le0'), not new (e.g. 'le0:1')
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- IPaddr.in 10 Mar 2006 04:14:20 -0000 1.38
+++ IPaddr.in 20 Apr 2006 16:33:23 -0000 1.39
@@ -496,12 +496,13 @@
add_interface () {
ipaddr="$1"
- iface="$2"
- netmask_bits="$3"
+ iface_base="$2"
+ iface="$3"
+ netmask_bits="$4"
netmask_text=""
- broadcast="$4"
+ broadcast="$5"
- IFCMD="$FINDIF $ipaddr/$netmask_bits/$iface/$broadcast"
+ IFCMD="$FINDIF $ipaddr/$netmask_bits/$iface_base/$broadcast"
NICINFO=`$IFCMD`
rc=$?
@@ -579,7 +580,7 @@
ifname=`cat "$VLDIR/$ipaddr"`
ocf_log info "Restoring loopback IP Address " \
"$ipaddr on $ifname."
- add_interface "$ipaddr" "$ifname" "32"
+ add_interface "$ipaddr" "$ifname" "$ifname" "32"
rm -f "$VLDIR/$ipaddr"
fi
}
@@ -705,7 +706,7 @@
fi
fi
- add_interface "$OCF_RESKEY_ip" "$NIC_unique" "$OCF_RESKEY_netmask"
"$OCF_RESKEY_broadcast"
+ add_interface "$OCF_RESKEY_ip" "$OCF_RESKEY_nic" "$NIC_unique"
"$OCF_RESKEY_netmask" "$OCF_RESKEY_broadcast"
rc=$?
if [ $rc != 0 ]; then
return $rc
------------------------------
Message: 2
Date: Thu, 20 Apr 2006 11:14:57 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
Changed some timing code to not be quite a particular as it had been...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -3 -r1.502 -r1.503
--- heartbeat.c 20 Apr 2006 15:00:16 -0000 1.502
+++ heartbeat.c 20 Apr 2006 17:14:56 -0000 1.503
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.502 2006/04/20 15:00:16 alan Exp $ */
+/* $Id: heartbeat.c,v 1.503 2006/04/20 17:14:56 alan Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -1388,7 +1388,7 @@
id=Gmain_timeout_add_full(G_PRIORITY_HIGH-5
, cl_cpu_limit_ms_interval()
, hb_update_cpu_limit, NULL, NULL);
- G_main_setall_id(id, "cpu limit", 50, 10);
+ G_main_setall_id(id, "cpu limit", 50, 20);
}
cl_make_realtime(-1, hb_realtime_prio, 32, config->memreserve);
@@ -1479,7 +1479,7 @@
/* Send local status at the "right time" */
id=Gmain_timeout_add_full(PRI_SENDSTATUS, config->heartbeat_ms
, hb_send_local_status, NULL, NULL);
- G_main_setall_id(id, "send local status", config->heartbeat_ms/2, 50);
+ G_main_setall_id(id, "send local status", 10+config->heartbeat_ms/2,
50);
id=Gmain_timeout_add_full(PRI_AUDITCLIENT
, config->initial_deadtime_ms
@@ -1509,7 +1509,7 @@
/* Check for pending signals */
id=Gmain_timeout_add_full(PRI_CHECKSIGS, config->heartbeat_ms
, Gmain_hb_signal_process_pending, NULL, NULL);
- G_main_setall_id(id, "check for signals", config->heartbeat_ms/2, 50);
+ G_main_setall_id(id, "check for signals", 10+config->heartbeat_ms/2,
50);
id=Gmain_timeout_add_full(PRI_FREEMSG, 500
, Gmain_update_msgfree_count, NULL, NULL);
@@ -6132,6 +6132,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.503 2006/04/20 17:14:56 alan
+ * Changed some timing code to not be quite a particular as it had been...
+ *
* Revision 1.502 2006/04/20 15:00:16 alan
* Put in code to use the library temporary process creation/run code
* instead of the inline heartbeat code
------------------------------
_______________________________________________
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 109
*********************************************
