Changeset 805

Timestamp:

01/13/09 03:23:26 (11 months ago)

Author:

hachi

Message:

Fix reconnects on dead sockets to not be as slow.

Location:

trunk/api/perl

Files:

• ChangeLog (modified) (1 diff)
• lib/Cache/Memcached.pm (modified) (4 diffs)
• t/05_reconnect_timeout.t (added)

trunk/api/perl/ChangeLog

@@ +1 @@
+        * Reconnects to a dead connection shouldn't happen every time when the
+          connection has never succeded. Apply the dead timeout to sockets that
+          never even came up. Add a test.
+
         * Warn when trying to put undef values into memcache.
           (Henry Lyne <hlyne@livejournalinc.com>)

trunk/api/perl/lib/Cache/Memcached.pm

@@ -245 +245 @@
         if ($self && $self->{pref_ip}{$ip}) {
             socket($sock, PF_INET, SOCK_STREAM, $proto);
+            $sock_map{$sock} = $host;
             my $prefip = $self->{pref_ip}{$ip};
             $sin = Socket::sockaddr_in($port,Socket::inet_aton($prefip));
@@ -260 +261 @@
         unless ($connected) {
             socket($sock, PF_INET, SOCK_STREAM, $proto);
+            $sock_map{$sock} = $host;
             $sin = Socket::sockaddr_in($port,Socket::inet_aton($ip));
             my $timeout = $self ? $self->{connect_timeout} : 0.25;
@@ -270 +272 @@
     } else { # it's a unix domain/local socket
         socket($sock, PF_UNIX, SOCK_STREAM, 0);
+        $sock_map{$sock} = $host;
         $sin = Socket::sockaddr_un($host);
         my $timeout = $self ? $self->{connect_timeout} : 0.25;
@@ -284 +287 @@
     select($old);
 
-    $sock_map{$sock} = $host;
     $cache_sock{$host} = $sock;