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: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lrm by lars from (linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lrm by lars from (linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Aug 2006 02:50:18 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Document mandatory configuration arguments
yes|no argument to autoreload and quiescent is mandatory
Backport of 1.178 (ldirectord.in 1.34)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.79
retrieving revision 1.77.2.80
diff -u -3 -r1.77.2.79 -r1.77.2.80
--- ldirectord 15 Aug 2006 08:48:57 -0000 1.77.2.79
+++ ldirectord 15 Aug 2006 08:50:18 -0000 1.77.2.80
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.79 2006/08/15 08:48:57 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.80 2006/08/15 08:50:18 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -144,7 +144,7 @@
Default: 1
-B<autoreload = >[B<yes>|B<no>]
+B<autoreload = >B<yes>|B<no>
Defines if <ldirectord> should continuously check the configuration file
for modification. If this is set to 'yes' and the configuration file
@@ -235,7 +235,7 @@
Default: I<no>
-B<quiescent = >[B<yes>|B<no>]
+B<quiescent = >B<yes>|B<no>
If I<yes>, then when real or failback servers are determined
to be down, they are not actually removed from the kernel's LVS
------------------------------
Message: 2
Date: Tue, 15 Aug 2006 02:51:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
If the resource has already been postponed once, don't overwrite the
existing timer.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -3 -r1.238 -r1.239
--- lrmd.c 15 Aug 2006 06:56:02 -0000 1.238
+++ lrmd.c 15 Aug 2006 08:51:31 -0000 1.239
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.238 2006/08/15 06:56:02 zhenh Exp $ */
+/* $Id: lrmd.c,v 1.239 2006/08/15 08:51:31 lars Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -368,7 +368,7 @@
static gboolean shutdown_in_progress = FALSE;
static unsigned long apphb_interval = 2000; /* Millisecond */
static gboolean reg_to_apphbd = FALSE;
-static int max_children = 4;
+static int max_child_count = 4;
static int retry_interval = 1000; /* Millisecond */
static int child_count = 0;
@@ -3099,11 +3099,18 @@
break;
}
- if (child_count >= max_children) {
+ if ((int)rsc->delay_timeout > 0) {
+ lrmd_log(LOG_INFO
+ , "Operation is already delayed: %s"
+ , op_info(op));
+ break;
+ }
+
+ if (child_count >= max_child_count) {
lrmd_debug2(LOG_NOTICE
- , "max_child_count (%d) reached, postponing "
- "execution of %s by %d ms"
- , max_children, op_info(op), retry_interval);
+ , "max_child_count (%d) reached, postponing "
+ "execution of %s by %d ms"
+ , max_children, op_info(op), retry_interval);
rsc->delay_timeout = Gmain_timeout_add(retry_interval
, rsc_execution_freeze_timeout, rsc);
break;
@@ -3895,6 +3902,10 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.239 2006/08/15 08:51:31 lars
+ * If the resource has already been postponed once, don't overwrite the
+ * existing timer.
+ *
* Revision 1.238 2006/08/15 06:56:02 zhenh
* use zero as unset tag of gloop instead of -1. avoid beam complain
*
------------------------------
Message: 3
Date: Tue, 15 Aug 2006 02:51:56 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Literal arguments to checktype should be bold not italic
Backport of 1.179 (ldirectord.in 1.35)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.80
retrieving revision 1.77.2.81
diff -u -3 -r1.77.2.80 -r1.77.2.81
--- ldirectord 15 Aug 2006 08:50:18 -0000 1.77.2.80
+++ ldirectord 15 Aug 2006 08:51:56 -0000 1.77.2.81
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.80 2006/08/15 08:50:18 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.81 2006/08/15 08:51:56 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -280,7 +280,7 @@
emailalertfreq and quiescent options listed above may also appear inside a
virtual section, in which case the global setting is overridden.
-B<checktype = >I<negotiate>|I<connect>|I<N>|I<ping>|I<off>|I<on>
+B<checktype = >B<negotiate>|B<connect>|I<N>|B<ping>|B<off>|B<on>
Type of check to perform. Negotiate sends a request and matches a receive
string. Connect only attemts to make a TCP/IP connection, thus the
------------------------------
Message: 4
Date: Tue, 15 Aug 2006 02:51:59 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Conflict resolution artifact.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -3 -r1.239 -r1.240
--- lrmd.c 15 Aug 2006 08:51:31 -0000 1.239
+++ lrmd.c 15 Aug 2006 08:51:59 -0000 1.240
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.239 2006/08/15 08:51:31 lars Exp $ */
+/* $Id: lrmd.c,v 1.240 2006/08/15 08:51:59 lars Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3110,7 +3110,7 @@
lrmd_debug2(LOG_NOTICE
, "max_child_count (%d) reached, postponing "
"execution of %s by %d ms"
- , max_children, op_info(op), retry_interval);
+ , max_child_count, op_info(op), retry_interval);
rsc->delay_timeout = Gmain_timeout_add(retry_interval
, rsc_execution_freeze_timeout, rsc);
break;
@@ -3902,6 +3902,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.240 2006/08/15 08:51:59 lars
+ * Conflict resolution artifact.
+ *
* Revision 1.239 2006/08/15 08:51:31 lars
* If the resource has already been postponed once, don't overwrite the
* existing timer.
------------------------------
_______________________________________________
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 33, Issue 58
********************************************
