X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_quit.c;h=8ac76d48aeb97b8d2323fd24526f58223108d701;hb=f6c04131cc9952372e3f63de2db4edc9f8181fb2;hp=9a200a1ee935041b6386a82aacb6d00e505bdd25;hpb=177497693368fb7f68494e57e92bb9e68658334b;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_quit.c b/libmemcached/memcached_quit.c index 9a200a1e..8ac76d48 100644 --- 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. */ @@ -18,7 +18,7 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death) memcached_return rc; char buffer[MEMCACHED_MAX_BUFFER]; - if (ptr->root->flags & MEM_BINARY_PROTOCOL) + if (ptr->root->flags & MEM_BINARY_PROTOCOL) { protocol_binary_request_quit request = {.bytes= {0}}; request.message.header.request.magic = PROTOCOL_BINARY_REQ; @@ -30,7 +30,7 @@ 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 @@ -39,6 +39,15 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death) 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); @@ -49,14 +58,14 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death) 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;