projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix a bug in update_continuum
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index a4ed6680da1f82323561925d662d35cbb3b024e8..de69e4465ef8c68e34d608f4bace32d4d0cd5042 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-34,7
+34,10
@@
static memcached_return set_hostinfo(memcached_server_st *server)
}
if (server->address_info)
}
if (server->address_info)
+ {
freeaddrinfo(server->address_info);
freeaddrinfo(server->address_info);
+ server->address_info= NULL;
+ }
server->address_info= ai;
return MEMCACHED_SUCCESS;
server->address_info= ai;
return MEMCACHED_SUCCESS;
@@
-45,17
+48,26
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
- if (ptr->root->
flags & MEM_NO_BLOCK
)
+ if (ptr->root->
snd_timeout
)
{
int error;
struct timeval waittime;
{
int error;
struct timeval waittime;
- waittime.tv_sec=
1
0;
- 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);
error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDTIMEO,
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
+ }
+
+ 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));
error= setsockopt(ptr->fd, SOL_SOCKET, SO_RCVTIMEO,
&waittime, (socklen_t)sizeof(struct timeval));
@@
-163,6
+175,14
@@
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;
+ }
+ }
/* Old connection junk still is in the structure */
WATCHPOINT_ASSERT(ptr->cursor_active == 0);
/* Old connection junk still is in the structure */
WATCHPOINT_ASSERT(ptr->cursor_active == 0);
@@
-215,7
+235,7
@@
test_connect:
{
goto handle_retry;
}
{
goto handle_retry;
}
- else if (error != 1)
+ else if (error != 1
|| fds[0].revents & POLLERR
)
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
@@
-228,6
+248,14
@@
test_connect:
ptr->address_info= NULL;
}
ptr->address_info= NULL;
}
+ if (ptr->root->retry_timeout)
+ {
+ struct timeval next_time;
+
+ gettimeofday(&next_time, NULL);
+ ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+ }
+ ptr->server_failure_counter+= 1;
return MEMCACHED_ERRNO;
}
return MEMCACHED_ERRNO;
}
@@
-255,15
+283,19
@@
handle_retry:
else
{
WATCHPOINT_ASSERT(ptr->cursor_active == 0);
else
{
WATCHPOINT_ASSERT(ptr->cursor_active == 0);
+ ptr->server_failure_counter= 0;
return MEMCACHED_SUCCESS;
}
use = use->ai_next;
}
}
return MEMCACHED_SUCCESS;
}
use = use->ai_next;
}
}
- if (ptr->fd == -1)
+ if (ptr->fd == -1) {
+ ptr->server_failure_counter+= 1;
return MEMCACHED_ERRNO; /* The last error should be from connect() */
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() */
}
return MEMCACHED_SUCCESS; /* The last error should be from connect() */
}