#include "common.h"
+#include <netdb.h>
#include <poll.h>
#include <sys/time.h>
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;
}
if (server->address_info)
+ {
freeaddrinfo(server->address_info);
+ server->address_info= NULL;
+ }
server->address_info= ai;
return MEMCACHED_SUCCESS;
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 linger linger;
struct timeval waittime;
- waittime.tv_sec= 10;
- waittime.tv_usec= 0;
-
- linger.l_onoff= 1;
- linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT;
- error= setsockopt(ptr->fd, SOL_SOCKET, SO_LINGER,
- &linger, (socklen_t)sizeof(struct linger));
- WATCHPOINT_ASSERT(error == 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;
+ struct linger linger;
+
+ linger.l_onoff= 1;
+ linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT;
+ error= setsockopt(ptr->fd, SOL_SOCKET, SO_LINGER,
+ &linger, (socklen_t)sizeof(struct linger));
+ WATCHPOINT_ASSERT(error == 0);
+ }
if (ptr->root->flags & MEM_TCP_NODELAY)
{
{
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);
}
}
}
}
+
+ WATCHPOINT_ASSERT(ptr->fd != -1);
return MEMCACHED_SUCCESS;
}
{
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;
rc= set_hostinfo(ptr);
if (rc != MEMCACHED_SUCCESS)
return rc;
- ptr->sockaddr_inited= MEMCACHED_ALLOCATED;
+ ptr->sockaddr_inited= true;
}
use= ptr->address_info;
(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;
}
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() */
}
projects / awesomized / libmemcached / blobdiff