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: ldirectord by horms from
([email protected])
2. Linux-HA CVS: ldirectord by horms from
([email protected])
3. Linux-HA CVS: membership by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 30 Nov 2005 17:39:41 -0700 (MST)
From: [email protected]
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:
Fix a problem relating to zombie real servers appearing if the real and virtual
servers have different ports - comment inline
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.36
retrieving revision 1.77.2.37
diff -u -3 -r1.77.2.36 -r1.77.2.37
--- ldirectord 30 Oct 2005 05:46:04 -0000 1.77.2.36
+++ ldirectord 1 Dec 2005 00:39:40 -0000 1.77.2.37
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.36 2005/10/30 05:46:04 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.37 2005/12/01 00:39:40 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -2381,6 +2381,16 @@
$virtual_str =~ /(.*):(.*)/;
$rservice .= ":" . $2;
$or=$ov->{"real"}->{$rservice};
+ # If this doesn't exist either, use the original service.
+ # Otherwise if masq and quescence is in use, the
+ # real server is not local, and it has an alternate port to
+ # the virtual server, using the mapped service will
+ # result in a quiescent service being created on the
+ # virtual server's port, which is not wanted.
+ if(!defined($or)) {
+ $rservice = $old_rservice;
+ $old_rservice = undef;
+ }
}
if((!defined($or) and !defined($is_quiescent)) or
------------------------------
Message: 2
Date: Wed, 30 Nov 2005 17:40:09 -0700 (MST)
From: [email protected]
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:
ldirectord
Log Message:
Fix a problem relating to zombie real servers appearing if the real and virtual
servers have different ports - comment inline
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- ldirectord 31 Oct 2005 04:30:29 -0000 1.127
+++ ldirectord 1 Dec 2005 00:40:09 -0000 1.128
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.127 2005/10/31 04:30:29 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.128 2005/12/01 00:40:09 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -561,6 +561,14 @@
read_config();
undef @OLDVIRTUAL;
+ {
+ my $log_str = "Invoking ldirectord invoked as: $0 ";
+ for my $i (@ARGV) {
+ $log_str .= $i . " ";
+ }
+ ld_log($log_str);
+ }
+
my $oldpid;
my $filepid;
if (open(FILE, "<$RUNPID.$CFGNAME.pid")) {
@@ -1578,7 +1586,7 @@
for my $k (keys %$or) {
&system_wrapper("$IPVSADM -d " . $nv->{proto} .
&get_virtual($nv) . " -r $k");
- &ld_log("Removed real server: $k (" .
+ &ld_log("Removed real server (start): $k (" .
#scalar(%{$nv->{real_status}}) .
" x " . &get_virtual($nv) . ")\n");
delete($$or{$k});
@@ -1604,7 +1612,8 @@
# service still exists, remove it
&system_wrapper("$IPVSADM -D " . $nv->{proto} . " " .
&get_virtual($nv));
- &ld_log("Removed virtual server: " . &get_virtual($nv) . "\n");
+ &ld_log("Removed virtual server (start): " .
+ &get_virtual($nv) . "\n");
}
}
@@ -1628,14 +1637,14 @@
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: " .
+ &ld_log("Removed real server (stop): " .
"$$r{server}:$$r{port} (" .
#scalar(%{$v->{real_status}}) .
- " x " . &get_virtual($v) );
+ " x " . &get_virtual($v) . ")" );
}
}
&system_wrapper("$IPVSADM -D $$v{proto} " . &get_virtual($v));
- &ld_log("Removed virtual server: " . &get_virtual($v));
+ &ld_log("Removed virtual server (stop): " . &get_virtual($v));
}
}
@@ -2406,6 +2415,16 @@
$virtual_str =~ /(.*):(.*)/;
$rservice .= ":" . $2;
$or=$ov->{"real"}->{$rservice};
+ # If this doesn't exist either, use the original service.
+ # Otherwise if masq and quescence is in use, the
+ # real server is not local, and it has an alternate port to
+ # the virtual server, using the mapped service will
+ # result in a quiescent service being created on the
+ # virtual server's port, which is not wanted.
+ if(!defined($or)) {
+ $rservice = $old_rservice;
+ $old_rservice = undef;
+ }
}
if((!defined($or) and !defined($is_quiescent)) or
@@ -2535,7 +2554,7 @@
}
# Set the status of a server as down
-# Should onlu be called from _service_down or _ld_stop
+# Should only be called from _service_down or ld_stop
sub _status_down
{
@@ -2789,7 +2808,7 @@
print "[$now] $message\n";
} elsif ( $LDIRLOG =~ /^\/(.*)/ ) {
unless (open(LOGFILE, ">>$LDIRLOG")
- and print LOGFILE "[$now|$CFGNAME] $message\n"
+ and print LOGFILE "[$now|$CFGNAME|$$]
$message\n"
and close(LOGFILE)) {
print STDERR "$message\n";
return 1;
------------------------------
Message: 3
Date: Wed, 30 Nov 2005 18:42:38 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccmlib_clm.c
Log Message:
corrected the order
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccmlib_clm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ccmlib_clm.c 30 Nov 2005 02:02:59 -0000 1.12
+++ ccmlib_clm.c 1 Dec 2005 01:42:38 -0000 1.13
@@ -220,12 +220,12 @@
}
return SA_OK;
- err_nomem_exit:
+ err_lib_exit:
g_hash_table_remove(__handle_hash, hash_key);
g_free(hd);
g_free(hash_key);
- err_lib_exit:
+ err_nomem_exit:
oc_ev_unregister(ev_token);
return rc;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 1
*******************************************
