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: linux-ha by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: ldirectord by horms 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: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Aug 2006 02:29:44 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
The support files probably need a better location but for now sbin will do
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- heartbeat.spec.in 15 Aug 2006 08:26:21 -0000 1.200
+++ heartbeat.spec.in 15 Aug 2006 08:29:44 -0000 1.201
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.200 2006/08/15 08:26:21 andrew Exp $
+# $Id: heartbeat.spec.in,v 1.201 2006/08/15 08:29:44 andrew Exp $
%define _unpackaged_files_terminate_build 1
%define _missing_doc_files_terminate_build 1
@@ -1401,6 +1401,9 @@
@sbindir@/attrd_updater
@sbindir@/crm_failcount
@sbindir@/crm_primitive.py
[EMAIL PROTECTED]@/cluster.py
[EMAIL PROTECTED]@/crm_utils.py
[EMAIL PROTECTED]@/crm_commands.py
%dir %attr (755, @HA_CCMUSER@, @HA_APIGROUP@) @HA_VARRUNDIR@/@HB_PKG@/ccm
%dir %attr (750, @HA_CCMUSER@, @HA_APIGROUP@) @HA_VARRUNDIR@/@HB_PKG@/crm
%dir %attr (750, @HA_CCMUSER@, @HA_APIGROUP@) @localstatedir@/lib/@HB_PKG@/crm
------------------------------
Message: 2
Date: Tue, 15 Aug 2006 02:30:08 -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.cf
Log Message:
Add emailalert and emailalertfreq to ldirectord.cf
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.cf,v
retrieving revision 1.19.2.11
retrieving revision 1.19.2.12
diff -u -3 -r1.19.2.11 -r1.19.2.12
--- ldirectord.cf 15 Aug 2006 08:14:09 -0000 1.19.2.11
+++ ldirectord.cf 15 Aug 2006 08:30:08 -0000 1.19.2.12
@@ -15,6 +15,8 @@
autoreload=yes
#logfile="/var/log/ldirectord.log"
#logfile="local0"
+#emailalert="[EMAIL PROTECTED]"
+#emailalertfreq=3600
quiescent=yes
# Sample for an http virtual service
------------------------------
Message: 3
Date: Tue, 15 Aug 2006 02:33:08 -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:
Log email alerts
Backport of 1.163 (ldirectord.in 1.19)
Signed-Off-By: Horms <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.66
retrieving revision 1.77.2.67
diff -u -3 -r1.77.2.66 -r1.77.2.67
--- ldirectord 15 Aug 2006 08:29:16 -0000 1.77.2.66
+++ ldirectord 15 Aug 2006 08:33:07 -0000 1.77.2.67
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.66 2006/08/15 08:29:16 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.67 2006/08/15 08:33:07 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -3188,6 +3188,8 @@
use Mail::Send;
+ &ld_log("emailalert: $emailsubject");
+
unless ($emailmsg = new Mail::Send Subject=>$emailsubject, To=>$emailto
and $emailfh = $emailmsg->open
and print $emailfh $emailsubject
------------------------------
Message: 4
Date: Tue, 15 Aug 2006 02:34:41 -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:
Add new calls to purge services and virtuals
Previously this code was just done inline, and although
this is a bit more verbose, it seems a bit more cleaner,
and should allow things like emailalerts fit in with
start-stop a bit better.
Backport of 1.164 (ldirectord.cf 1.20)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.67
retrieving revision 1.77.2.68
diff -u -3 -r1.77.2.67 -r1.77.2.68
--- ldirectord 15 Aug 2006 08:33:07 -0000 1.77.2.67
+++ ldirectord 15 Aug 2006 08:34:40 -0000 1.77.2.68
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.67 2006/08/15 08:33:07 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.68 2006/08/15 08:34:40 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -1830,11 +1830,7 @@
# remove remaining entries for real servers
for my $k (keys %$or) {
- &system_wrapper("$IPVSADM -d " . $nv->{proto} .
- &get_virtual($nv) . " -r $k");
- &ld_log("Removed real server (start): $k (" .
- #scalar(%{$nv->{real_status}}) .
- " x " . &get_virtual($nv) . ")\n");
+ purge_untracked_service($nv, $k, "start");
delete($$or{$k});
}
@@ -1855,11 +1851,7 @@
$nv->{protocol}})) {
next;
}
- # service still exists, remove it
- &system_wrapper("$IPVSADM -D " . $nv->{proto} . " " .
- &get_virtual($nv));
- &ld_log("Removed virtual server (start): " .
- &get_virtual($nv) . "\n");
+ purge_virtual($nv, "start");
}
}
@@ -1881,16 +1873,10 @@
my $real = $$v{real};
foreach my $r (@$real) {
if (defined $$r{virtual_status}) {
- &system_wrapper("$IPVSADM -d $$v{proto} " .
&get_virtual($v) . " -r $$r{server}:$$r{port}");
- _status_down($v, $r);
- &ld_log("Removed real server (stop): " .
- "$$r{server}:$$r{port} (" .
- #scalar(%{$v->{real_status}}) .
- " x " . &get_virtual($v) . ")" );
+ purge_service($v, $r, "stop");
}
}
- &system_wrapper("$IPVSADM -D $$v{proto} " . &get_virtual($v));
- &ld_log("Removed virtual server (stop): " . &get_virtual($v));
+ purge_virtual($v, "stop");
}
}
@@ -3067,6 +3053,38 @@
}
+# Used during stop, start and reload to remove stale real servers from LVS
+sub purge_untracked_service
+{
+ my ($v, $rservice, $tag) = (@_);
+
+ &system_wrapper("$IPVSADM -d $v->{proto} " . &get_virtual($v) .
+ " -r $rservice");
+ &ld_log("Purged real server ($tag): " .
+ "$rservice (" . &get_virtual($v) . ")");
+}
+
+
+# Used during stop, start and reload to remove stale real servers from LVS
+sub purge_service
+{
+ my ($v, $r, $tag) = (@_);
+
+ purge_untracked_service($v, "$r->{server}:$r->{port}", $tag);
+ _status_down($v, $r);
+}
+
+
+# Used during stop, start and reload to remove stale virtual services from LVS
+sub purge_virtual
+{
+ my ($v, $tag) = (@_);
+
+ &system_wrapper("$IPVSADM -D $v->{proto} " . &get_virtual($v));
+ &ld_log("Purged virtual server ($tag): " . &get_virtual($v));
+}
+
+
sub check_cfgfile
{
my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev,
------------------------------
_______________________________________________
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 53
********************************************
