projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates for 0.29 release
[awesomized/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index aca8ffd0a00088964d6110fa2d55663441b451e1..e9ae0c76d92c9c0bef3a4e53ab1c7ee10731da15 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-121,7
+121,7
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
}
/* For the moment, not getting a nonblocking mode will not be fatal */
}
/* For the moment, not getting a nonblocking mode will not be fatal */
- if (
ptr->root->flags & MEM_NO_BLOCK
)
+ if (
(ptr->root->flags & MEM_NO_BLOCK) || ptr->root->connect_timeout
)
{
int flags;
{
int flags;
@@
-185,16
+185,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
{
struct addrinfo *use;
{
struct addrinfo *use;
- 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 ||
+ if (!ptr->sockaddr_inited ||
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
@@
-243,7
+234,9
@@
static memcached_return network_connect(memcached_server_st *ptr)
if (errno == EINPROGRESS || /* nonblocking mode - first return, */
errno == EALREADY) /* nonblocking mode - subsequent returns */
{
if (errno == EINPROGRESS || /* nonblocking mode - first return, */
errno == EALREADY) /* nonblocking mode - subsequent returns */
{
- struct pollfd fds[1] = { [0].fd = ptr->fd, [0].events = POLLOUT };
+ struct pollfd fds[1];
+ fds[0].fd = ptr->fd;
+ fds[0].events = POLLOUT;
int error= poll(fds, 1, ptr->root->connect_timeout);
if (error != 1 || fds[0].revents & POLLERR)
int error= poll(fds, 1, ptr->root->connect_timeout);
if (error != 1 || fds[0].revents & POLLERR)
@@
-251,9
+244,9
@@
static memcached_return network_connect(memcached_server_st *ptr)
if (fds[0].revents & POLLERR)
{
int err;
if (fds[0].revents & POLLERR)
{
int err;
-
in
t len = sizeof (err);
+
socklen_
t len = sizeof (err);
(void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len);
(void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len);
- ptr->cached_errno=
errno
;
+ ptr->cached_errno=
(err == 0) ? errno : err
;
}
(void)close(ptr->fd);
}
(void)close(ptr->fd);
@@
-275,7
+268,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
if (ptr->fd != -1)
{
/* restore flags */
if (ptr->fd != -1)
{
/* restore flags */
- if (ptr->root->connect_timeout && (
flags & O_NON
BLOCK) == 0)
+ if (ptr->root->connect_timeout && (
ptr->root->flags & MEM_NO_
BLOCK) == 0)
(void)fcntl(ptr->fd, F_SETFL, flags & ~O_NONBLOCK);
WATCHPOINT_ASSERT(ptr->cursor_active == 0);
(void)fcntl(ptr->fd, F_SETFL, flags & ~O_NONBLOCK);
WATCHPOINT_ASSERT(ptr->cursor_active == 0);
@@
-297,6
+290,8
@@
static memcached_return network_connect(memcached_server_st *ptr)
ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
}
ptr->server_failure_counter+= 1;
ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
}
ptr->server_failure_counter+= 1;
+ if (ptr->cached_errno == 0)
+ return MEMCACHED_TIMEOUT;
return MEMCACHED_ERRNO; /* The last error should be from connect() */
}
return MEMCACHED_ERRNO; /* The last error should be from connect() */
}
@@
-310,14
+305,29
@@
memcached_return memcached_connect(memcached_server_st *ptr)
memcached_return rc= MEMCACHED_NO_SERVERS;
LIBMEMCACHED_MEMCACHED_CONNECT_START();
memcached_return rc= MEMCACHED_NO_SERVERS;
LIBMEMCACHED_MEMCACHED_CONNECT_START();
- if (ptr->root->retry_timeout)
+ /* both retry_timeout and server_failure_limit must be set in order to delay retrying a server on error. */
+ if (ptr->root->retry_timeout && ptr->root->server_failure_limit)
{
struct timeval next_time;
gettimeofday(&next_time, NULL);
{
struct timeval next_time;
gettimeofday(&next_time, NULL);
+
+ /* if we've had too many consecutive errors on this server, mark it dead. */
+ if (ptr->server_failure_counter > ptr->root->server_failure_limit)
+ {
+ ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+ ptr->server_failure_counter= 0;
+ }
+
if (next_time.tv_sec < ptr->next_retry)
if (next_time.tv_sec < ptr->next_retry)
- return MEMCACHED_TIMEOUT;
+ {
+ if (memcached_behavior_get(ptr->root, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS))
+ run_distribution(ptr->root);
+
+ return MEMCACHED_SERVER_MARKED_DEAD;
+ }
}
}
+
/* We need to clean up the multi startup piece */
switch (ptr->type)
{
/* We need to clean up the multi startup piece */
switch (ptr->type)
{