X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_connect.c;h=aca8ffd0a00088964d6110fa2d55663441b451e1;hb=7e0ffed050b62cc5dcf5d16c148185074bfd7d50;hp=a4ed6680da1f82323561925d662d35cbb3b024e8;hpb=db3442ca6769650638eab10b130a54882045fff0;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c index a4ed6680..aca8ffd0 100644 --- a/libmemcached/memcached_connect.c +++ b/libmemcached/memcached_connect.c @@ -1,4 +1,5 @@ #include "common.h" +#include #include #include @@ -13,7 +14,7 @@ static memcached_return set_hostinfo(memcached_server_st *server) memset(&hints, 0, sizeof(hints)); - hints.ai_family= AF_INET; + // hints.ai_family= AF_INET; if (server->type == MEMCACHED_CONNECTION_UDP) { hints.ai_protocol= IPPROTO_UDP; @@ -34,7 +35,10 @@ static memcached_return set_hostinfo(memcached_server_st *server) } if (server->address_info) + { freeaddrinfo(server->address_info); + server->address_info= NULL; + } server->address_info= ai; return MEMCACHED_SUCCESS; @@ -42,25 +46,40 @@ static memcached_return set_hostinfo(memcached_server_st *server) static memcached_return set_socket_options(memcached_server_st *ptr) { + WATCHPOINT_ASSERT(ptr->fd != -1); + if (ptr->type == MEMCACHED_CONNECTION_UDP) return MEMCACHED_SUCCESS; - if (ptr->root->flags & MEM_NO_BLOCK) +#ifdef HAVE_SNDTIMEO + if (ptr->root->snd_timeout) { int error; struct timeval waittime; - waittime.tv_sec= 10; - waittime.tv_usec= 0; + waittime.tv_sec= 0; + waittime.tv_usec= ptr->root->snd_timeout; error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDTIMEO, &waittime, (socklen_t)sizeof(struct timeval)); WATCHPOINT_ASSERT(error == 0); + } +#endif + +#ifdef HAVE_RCVTIMEO + if (ptr->root->rcv_timeout) + { + int error; + struct timeval waittime; + + waittime.tv_sec= 0; + waittime.tv_usec= ptr->root->rcv_timeout; error= setsockopt(ptr->fd, SOL_SOCKET, SO_RCVTIMEO, &waittime, (socklen_t)sizeof(struct timeval)); WATCHPOINT_ASSERT(error == 0); } +#endif { int error; @@ -96,7 +115,7 @@ static memcached_return set_socket_options(memcached_server_st *ptr) { int error; - error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDBUF, + error= setsockopt(ptr->fd, SOL_SOCKET, SO_RCVBUF, &ptr->root->recv_size, (socklen_t)sizeof(int)); WATCHPOINT_ASSERT(error == 0); } @@ -140,7 +159,8 @@ test_connect: (struct sockaddr *)&servAddr, sizeof(servAddr)) < 0) { - switch (errno) { + switch (errno) + { case EINPROGRESS: case EALREADY: case EINTR: @@ -154,6 +174,8 @@ test_connect: } } } + + WATCHPOINT_ASSERT(ptr->fd != -1); return MEMCACHED_SUCCESS; } @@ -163,10 +185,16 @@ static memcached_return network_connect(memcached_server_st *ptr) { struct addrinfo *use; - /* Old connection junk still is in the structure */ - WATCHPOINT_ASSERT(ptr->cursor_active == 0); + if (ptr->root->server_failure_limit != 0) + { + if (ptr->server_failure_counter >= ptr->root->server_failure_limit) + { + memcached_server_remove(ptr); + return MEMCACHED_FAILURE; + } + } - if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED || + if (ptr->sockaddr_inited || (!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS))) { memcached_return rc; @@ -174,13 +202,20 @@ static memcached_return network_connect(memcached_server_st *ptr) rc= set_hostinfo(ptr); if (rc != MEMCACHED_SUCCESS) return rc; - ptr->sockaddr_inited= MEMCACHED_ALLOCATED; + ptr->sockaddr_inited= true; } use= ptr->address_info; /* Create the socket */ while (use != NULL) { + /* Memcache server does not support IPV6 in udp mode, so skip if not ipv4 */ + if (ptr->type == MEMCACHED_CONNECTION_UDP && use->ai_family != AF_INET) + { + use= use->ai_next; + continue; + } + if ((ptr->fd= socket(use->ai_family, use->ai_socktype, use->ai_protocol)) < 0) @@ -192,69 +227,59 @@ static memcached_return network_connect(memcached_server_st *ptr) (void)set_socket_options(ptr); - /* connect to server */ -test_connect: - if (connect(ptr->fd, - use->ai_addr, - use->ai_addrlen) < 0) + int flags; + if (ptr->root->connect_timeout) { - switch (errno) { - /* We are spinning waiting on connect */ - case EALREADY: - case EINPROGRESS: - { - struct pollfd fds[1]; - int error; + flags= fcntl(ptr->fd, F_GETFL, 0); + if (flags != -1 && !(flags & O_NONBLOCK)) + (void)fcntl(ptr->fd, F_SETFL, flags | O_NONBLOCK); + } - memset(&fds, 0, sizeof(struct pollfd)); - fds[0].fd= ptr->fd; - fds[0].events= POLLOUT | POLLERR; - error= poll(fds, 1, ptr->root->connect_timeout); + /* connect to server */ + while (ptr->fd != -1 && + connect(ptr->fd, use->ai_addr, use->ai_addrlen) < 0) + { + ptr->cached_errno= errno; + if (errno == EINPROGRESS || /* nonblocking mode - first return, */ + errno == EALREADY) /* nonblocking mode - subsequent returns */ + { + struct pollfd fds[1] = { [0].fd = ptr->fd, [0].events = POLLOUT }; + int error= poll(fds, 1, ptr->root->connect_timeout); - if (error == 0) - { - goto handle_retry; - } - else if (error != 1) + if (error != 1 || fds[0].revents & POLLERR) + { + if (fds[0].revents & POLLERR) { + int err; + int len = sizeof (err); + (void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len); ptr->cached_errno= errno; - WATCHPOINT_ERRNO(ptr->cached_errno); - WATCHPOINT_NUMBER(ptr->root->connect_timeout); - close(ptr->fd); - ptr->fd= -1; - if (ptr->address_info) - { - freeaddrinfo(ptr->address_info); - ptr->address_info= NULL; - } - - return MEMCACHED_ERRNO; } - break; + (void)close(ptr->fd); + ptr->fd= -1; } - /* We are spinning waiting on connect */ - case EINTR: - goto test_connect; - case EISCONN: /* We were spinning waiting on connect */ + } + else if (errno == EISCONN) /* we are connected :-) */ + { break; - default: -handle_retry: - ptr->cached_errno= errno; - close(ptr->fd); + } + else if (errno != EINTR) + { + (void)close(ptr->fd); ptr->fd= -1; - if (ptr->root->retry_timeout) - { - struct timeval next_time; - - gettimeofday(&next_time, NULL); - ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout; - } - } + break; + } } - else + + if (ptr->fd != -1) { + /* restore flags */ + if (ptr->root->connect_timeout && (flags & O_NONBLOCK) == 0) + (void)fcntl(ptr->fd, F_SETFL, flags & ~O_NONBLOCK); + WATCHPOINT_ASSERT(ptr->cursor_active == 0); + ptr->server_failure_counter= 0; return MEMCACHED_SUCCESS; } use = use->ai_next; @@ -262,8 +287,20 @@ handle_retry: } if (ptr->fd == -1) + { + /* Failed to connect. schedule next retry */ + if (ptr->root->retry_timeout) + { + struct timeval next_time; + + if (gettimeofday(&next_time, NULL) == 0) + ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout; + } + ptr->server_failure_counter+= 1; return MEMCACHED_ERRNO; /* The last error should be from connect() */ + } + ptr->server_failure_counter= 0; return MEMCACHED_SUCCESS; /* The last error should be from connect() */ }