X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.c;h=a82470000ff6496477e0cea7fcbc5f58dd62c57b;hb=259ed7e68a0de0887e9aedbe0aa5fdd9404929f9;hp=8b5acf67d1f056727f38328241af7b0c4abac6c4;hpb=9979e3f8206c764a881550dda41a444f005206f3;p=m6w6%2Flibmemcached diff --git a/libmemcached/quit.c b/libmemcached/quit.c index 8b5acf67..a8247000 100644 --- a/libmemcached/quit.c +++ b/libmemcached/quit.c @@ -11,13 +11,15 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death) { - if (ptr->fd != -1) + if (ptr->fd != INVALID_SOCKET) { - if (io_death == false && ptr->type != MEMCACHED_CONNECTION_UDP) + if (io_death == false && ptr->type != MEMCACHED_CONNECTION_UDP && ptr->options.is_shutting_down == false) { memcached_return_t rc; char buffer[MEMCACHED_MAX_BUFFER]; + ptr->options.is_shutting_down= true; + if (ptr->root->flags.binary_protocol) { protocol_binary_request_quit request = {.bytes= {0}}; @@ -28,7 +30,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death) } else { - rc= memcached_do(ptr, "quit\r\n", sizeof("quit\r\n"), true); + rc= memcached_do(ptr, "quit\r\n", sizeof("quit\r\n") -1, true); } WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED); @@ -38,10 +40,17 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death) * closing the socket before all data is read * results in server throwing away all data which is * not read + * + * In .40 we began to only do this if we had been doing buffered + * requests of had replication enabled. */ - ssize_t nread; - while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer), - &nread) == MEMCACHED_SUCCESS); + if (ptr->root->flags.buffer_requests || ptr->root->number_of_replicas) + { + 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 @@ -55,33 +64,35 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death) memcached_io_close(ptr); } - ptr->fd= -1; + ptr->fd= INVALID_SOCKET; + ptr->io_bytes_sent= 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; + ptr->options.is_shutting_down= false; memcached_server_response_reset(ptr); + // We reset the version so that if we end up talking to a different server + // we don't have stale server version information. + ptr->major_version= ptr->minor_version= ptr->micro_version= UINT8_MAX; + if (io_death) { ptr->server_failure_counter++; + set_last_disconnected_host(ptr); } } void memcached_quit(memcached_st *ptr) { - uint32_t x; - - if (memcached_server_count(ptr) == 0) - return; - if (memcached_server_count(ptr)) { - for (x= 0; x < memcached_server_count(ptr); x++) + for (uint32_t x= 0; x < memcached_server_count(ptr); x++) { - memcached_server_instance_st *instance= + memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x); - memcached_quit_server(instance, 0); + memcached_quit_server(instance, false); } } }