First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_quit.c

diff --git a/libmemcached/memcached_quit.c b/libmemcached/memcached_quit.c
index c93cb1883ac17dbadfe818a02fe43caf3dbe926c..3c117ade71d79b64c916fb53f3a250456ee5b214 100644 (file)
--- a/libmemcached/memcached_quit.c
+++ b/libmemcached/memcached_quit.c
@@ -2,10 +2,10 @@
 
 /*
   This closes all connections (forces flush of input as well).
-  
-  Maybe add a host specific, or key specific version? 
-  
-  The reason we send "quit" is that in case we have buffered IO, this 
+
+  Maybe add a host specific, or key specific version?
+
+  The reason we send "quit" is that in case we have buffered IO, this
   will force data to be completed.
 */
 
@@ -15,11 +15,10 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
   {
     if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
     {
-      memcached_return rc;
-      ssize_t read_length;
+      memcached_return_t rc;
       char buffer[MEMCACHED_MAX_BUFFER];
 
-      if (ptr->root->flags & MEM_BINARY_PROTOCOL) 
+      if (ptr->root->flags.binary_protocol)
       {
         protocol_binary_request_quit request = {.bytes= {0}};
         request.message.header.request.magic = PROTOCOL_BINARY_REQ;
@@ -31,33 +30,42 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
         rc= memcached_do(ptr, "quit\r\n", 6, 1);
 
       WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
-      
+
       /* read until socket is closed, or there is an error
        * closing the socket before all data is read
        * results in server throwing away all data which is
        * not read
        */
-      while ((read_length=
-             memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
-            > 0);
+      ssize_t nread;
+      while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
+                               &nread) == MEMCACHED_SUCCESS);
+
+      /*
+       * memcached_io_read may call memcached_quit_server with io_death if
+       * it encounters problems, but we don't care about those occurences.
+       * The intention of that loop is to drain the data sent from the
+       * server to ensure that the server processed all of the data we
+       * sent to the server.
+       */
+      ptr->server_failure_counter= 0;
     }
     memcached_io_close(ptr);
 
     ptr->fd= -1;
-    ptr->write_buffer_offset= (ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0 ;
+    ptr->write_buffer_offset= (size_t) ((ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
     ptr->read_buffer_length= 0;
     ptr->read_ptr= ptr->read_buffer;
     memcached_server_response_reset(ptr);
   }
 
-  ptr->server_failure_counter++;
+  if(io_death) ptr->server_failure_counter++;
 }
 
 void memcached_quit(memcached_st *ptr)
 {
   unsigned int x;
 
-  if (ptr->hosts == NULL || 
+  if (ptr->hosts == NULL ||
       ptr->number_of_hosts == 0)
     return;