Merge lp:~andrefcruz/libmemcached/recover-gracefully into lp:~tangent-org/libmemcached/trunk

[André Cruz]

[André Cruz (andrefcruz)]

memcached_io_reset on a dead server keeps him from ever coming back.

[lp:~andrefcruz/libmemcached/recover-gracefully]

802. By André Cruz on 2010-03-08

Added option to enable TCP_KEEPALIVE on created sockets.

803. By André Cruz on 2010-03-08

Implement flag retrieval for new keepalive flag.

804. By André Cruz on 2010-03-08

Implemented the TCP_KEEPIDLE tcp option. This is only available on Linux.

805. By André Cruz on 2010-03-08

Added missing constant.
Set keepalive before keepidle.

=== modified file 'docs/memcached_behavior.pod'
--- docs/memcached_behavior.pod	2010-01-15 00:35:02 +0000
+++ docs/memcached_behavior.pod	2010-03-08 17:26:35 +0000
@@ -211,11 +211,11 @@
 
 =item MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ
 
-Allows randomizing the replica reads starting point. Normally the read is 
+Allows randomizing the replica reads starting point. Normally the read is
 done from primary server and in case of miss the read is done from primary
-+ 1, then primary + 2 all the way to 'n' replicas. If this option is set 
++ 1, then primary + 2 all the way to 'n' replicas. If this option is set
 on the starting point of the replica reads is randomized between the servers.
-This allows distributing read load to multiple servers with the expense of 
+This allows distributing read load to multiple servers with the expense of
 more write traffic.
 
 =item MEMCACHED_BEHAVIOR_CORK
@@ -224,9 +224,16 @@
 MEMCACHED_NO_SERVERS is returned if no servers are available to test with.
 MEMCACHED_NOT_SUPPORTED is returned if we were not able to determine
 if support was available. All other responses then MEMCACHED_SUCCESS
-report an error of some sort. This behavior also enables 
+report an error of some sort. This behavior also enables
 MEMCACHED_BEHAVIOR_TCP_NODELAY when set.
 
+=item MEMCACHED_BEHAVIOR_KEEPALIVE
+
+Enable TCP_KEEPALIVE behavior.
+
+=item MEMCACHED_BEHAVIOR_KEEPALIVE_IDLE
+
+Specify time, in seconds, to mark a connection as idle. This is only available as an option Linux.
 
 =item MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE
 

=== modified file 'libmemcached/behavior.c'
--- libmemcached/behavior.c	2010-02-13 02:23:49 +0000
+++ libmemcached/behavior.c	2010-03-08 17:26:35 +0000
@@ -87,6 +87,10 @@
     ptr->flags.tcp_nodelay= set_flag(data);
     memcached_quit(ptr);
     break;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPALIVE:
+    ptr->flags.tcp_keepalive= set_flag(data);
+    memcached_quit(ptr);
+    break;
   case MEMCACHED_BEHAVIOR_DISTRIBUTION:
     return memcached_behavior_set_distribution(ptr, (memcached_server_distribution_t)data);
   case MEMCACHED_BEHAVIOR_KETAMA:
@@ -114,7 +118,7 @@
       /**
         @note We try to keep the same distribution going. This should be deprecated and rewritten.
       */
-      return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA); 
+      return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA);
     }
   case MEMCACHED_BEHAVIOR_HASH:
     return memcached_behavior_set_key_hash(ptr, (memcached_hash_t)(data));
@@ -153,6 +157,10 @@
     ptr->recv_size= (int32_t)data;
     memcached_quit(ptr);
     break;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPIDLE:
+    ptr->tcp_keepidle= (uint32_t)data;
+    memcached_quit(ptr);
+    break;
   case MEMCACHED_BEHAVIOR_USER_DATA:
     return MEMCACHED_FAILURE;
   case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
@@ -288,6 +296,8 @@
     return (uint64_t)ptr->snd_timeout;
   case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
     return (uint64_t)ptr->rcv_timeout;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPIDLE:
+    return (uint64_t)ptr->tcp_keepidle;
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       int sock_size= 0;
@@ -324,8 +334,8 @@
 
       instance= memcached_server_instance_fetch(ptr, 0);
 
-      /** 
-        @note REFACTOR 
+      /**
+        @note REFACTOR
       */
       if (instance)
       {
@@ -353,6 +363,8 @@
     return ptr->flags.randomize_replica_read;
   case MEMCACHED_BEHAVIOR_CORK:
     return ptr->flags.cork;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPALIVE:
+    return ptr->flags.tcp_keepalive;
   case MEMCACHED_BEHAVIOR_MAX:
   default:
     WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */

=== modified file 'libmemcached/connect.c'
--- libmemcached/connect.c	2010-02-13 02:23:49 +0000
+++ libmemcached/connect.c	2010-03-08 17:26:35 +0000
@@ -111,6 +111,31 @@
       return MEMCACHED_FAILURE;
   }
 
+  if (ptr->root->flags.tcp_keepalive)
+  {
+    int flag= 1;
+    int error;
+
+    error= setsockopt(ptr->fd, SOL_SOCKET, SO_KEEPALIVE,
+                      &flag, (socklen_t)sizeof(int));
+    WATCHPOINT_ASSERT(error == 0);
+    if (error)
+      return MEMCACHED_FAILURE;
+  }
+
+#ifdef TCP_KEEPIDLE
+  if (ptr->root->tcp_keepidle > 0)
+  {
+    int error;
+
+    error= setsockopt(ptr->fd, IPPROTO_TCP, TCP_KEEPIDLE,
+                      &ptr->root->tcp_keepidle, (socklen_t)sizeof(int));
+    WATCHPOINT_ASSERT(error == 0);
+    if (error)
+      return MEMCACHED_FAILURE;
+  }
+#endif
+
   if (ptr->root->send_size > 0)
   {
     int error;
@@ -368,7 +393,7 @@
     WATCHPOINT_ASSERT(0);
   }
 
-  unlikely ( rc != MEMCACHED_SUCCESS) 
+  unlikely ( rc != MEMCACHED_SUCCESS)
   {
     //@todo create interface around last_discontected_server
     memcached_st *root= (memcached_st *)ptr->root;

=== modified file 'libmemcached/constants.h'
--- libmemcached/constants.h	2010-02-05 01:15:17 +0000
+++ libmemcached/constants.h	2010-03-08 17:26:35 +0000
@@ -115,6 +115,8 @@
   MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
   MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ,
   MEMCACHED_BEHAVIOR_CORK,
+  MEMCACHED_BEHAVIOR_TCP_KEEPALIVE,
+  MEMCACHED_BEHAVIOR_TCP_KEEPIDLE,
   MEMCACHED_BEHAVIOR_MAX
 } memcached_behavior_t;
 

=== modified file 'libmemcached/memcached.c'
--- libmemcached/memcached.c	2010-02-17 01:58:35 +0000
+++ libmemcached/memcached.c	2010-03-08 17:26:35 +0000
@@ -5,7 +5,7 @@
  * Use and distribution licensed under the BSD license.  See
  * the COPYING file in the parent directory for full text.
  *
- * Summary: 
+ * Summary:
  *
  */
 
@@ -32,7 +32,8 @@
     .use_cache_lookups= false,
     .use_sort_hosts= false,
     .use_udp= false,
-    .verify_key= false
+    .verify_key= false,
+    .tcp_keepalive= false
   }
 };
 
@@ -62,6 +63,8 @@
   self->io_msg_watermark= 500;
   self->io_bytes_watermark= 65 * 1024;
 
+  self->tcp_keepidle= 0;
+
   self->io_key_prefetch= 0;
   self->cached_errno= 0;
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
@@ -225,6 +228,7 @@
   new_clone->io_bytes_watermark= source->io_bytes_watermark;
   new_clone->io_key_prefetch= source->io_key_prefetch;
   new_clone->number_of_replicas= source->number_of_replicas;
+  new_clone->tcp_keepidle= source->tcp_keepidle;
 
   if (memcached_server_count(source))
     rc= memcached_push(new_clone, source);

=== modified file 'libmemcached/memcached.h'
--- libmemcached/memcached.h	2010-02-17 01:58:35 +0000
+++ libmemcached/memcached.h	2010-03-08 17:26:35 +0000
@@ -80,6 +80,7 @@
     bool use_sort_hosts MEMCACHED_BITFIELD;
     bool use_udp MEMCACHED_BITFIELD;
     bool verify_key MEMCACHED_BITFIELD;
+    bool tcp_keepalive MEMCACHED_BITFIELD;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -93,6 +94,7 @@
   uint32_t io_msg_watermark;
   uint32_t io_bytes_watermark;
   uint32_t io_key_prefetch;
+  uint32_t tcp_keepidle;
   int cached_errno;
   int32_t poll_timeout;
   int32_t connect_timeout;

=== modified file 'libmemcached/storage.c'
--- libmemcached/storage.c	2010-02-13 02:23:49 +0000
+++ libmemcached/storage.c	2010-03-08 17:26:35 +0000
@@ -189,7 +189,8 @@
     return rc;
 
 error:
-  memcached_io_reset(instance);
+  if (rc == MEMCACHED_WRITE_FAILURE)
+    memcached_io_reset(instance);
 
   return rc;
 }