Store data.

diff --git a/libmemcached/fetch.cc b/libmemcached/fetch.cc
index 7f677d023e57aacaf43b9ef9d17059e637645b56..d795109259108b5bde95c5682cf5ca04f523790b 100644 (file)
--- a/libmemcached/fetch.cc
+++ b/libmemcached/fetch.cc
@@ -194,6 +194,7 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
   *error= MEMCACHED_MAXIMUM_RETURN; // We use this to see if we ever go into the loop
   memcached_instance_st *server;
   memcached_return_t read_ret= MEMCACHED_SUCCESS;
   *error= MEMCACHED_MAXIMUM_RETURN; // We use this to see if we ever go into the loop
   memcached_instance_st *server;
   memcached_return_t read_ret= MEMCACHED_SUCCESS;

+  bool connection_failures= false;

   while ((server= memcached_io_get_readable_server(ptr, read_ret)))
   {
     char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   while ((server= memcached_io_get_readable_server(ptr, read_ret)))
   {
     char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];


@@ -203,6 +204,11 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
     {
       continue;
     }
     {
       continue;
     }

+    else if (*error == MEMCACHED_CONNECTION_FAILURE)
+    {
+      connection_failures= true;
+      continue;
+    }

     else if (*error == MEMCACHED_SUCCESS)
     {
       result->count++;
     else if (*error == MEMCACHED_SUCCESS)
     {
       result->count++;


@@ -230,6 +236,16 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
   {
     *error= MEMCACHED_NOTFOUND;
   }
   {
     *error= MEMCACHED_NOTFOUND;
   }

+  else if (connection_failures)
+  {
+    /*  
+        If we have a connection failure to some servers, the caller may
+        wish to treat that differently to getting a definitive NOT_FOUND
+        from all servers, so return MEMCACHED_CONNECTION_FAILURE to allow
+        that. 
+        */
+    *error= MEMCACHED_CONNECTION_FAILURE;
+  }

   else if (*error == MEMCACHED_SUCCESS)
   {
     *error= MEMCACHED_END;
   else if (*error == MEMCACHED_SUCCESS)
   {
     *error= MEMCACHED_END;

diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc
index 7ece03b9bbabad323c11a58480f01b21277989a9..04b77ceac1d97b81c5e98b38a47a29dc553fa4d8 100644 (file)
--- a/libmemcached/quit.cc
+++ b/libmemcached/quit.cc
@@ -120,8 +120,15 @@ void memcached_quit_server(memcached_instance_st* instance, bool io_death)
 
   instance->close_socket();
 
 
   instance->close_socket();
 

-  if (io_death)
+  if (io_death and memcached_is_udp(instance->root))

   {
   {

+    /*
+       If using UDP, we should stop using the server briefly on every IO
+       failure. If using TCP, it may be that the connection went down a
+       short while ago (e.g. the server failed) and we've only just
+       noticed, so we should only set the retry timeout on a connect
+       failure (which doesn't call this method).
+       */

     memcached_mark_server_for_timeout(instance);
   }
 }
     memcached_mark_server_for_timeout(instance);
   }
 }