projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Deprecate MEMCACHED_NO_KEY_PROVIDED, and fixed key validation tests for the binary...
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 5531ad792d47175439d22c469138dbdb99575872..ca35420066582efcf7d62cc18e24845ca4921fa8 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-1,4
+1,5
@@
#include "common.h"
#include "common.h"
+#include <netdb.h>
#include <poll.h>
#include <sys/time.h>
#include <poll.h>
#include <sys/time.h>
@@
-13,7
+14,7
@@
static memcached_return set_hostinfo(memcached_server_st *server)
memset(&hints, 0, sizeof(hints));
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->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)
}
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;
@@
-42,32
+46,51
@@
static memcached_return set_hostinfo(memcached_server_st *server)
static memcached_return set_socket_options(memcached_server_st *ptr)
{
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->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
- if (ptr->root->flags & MEM_NO_BLOCK)
+#ifdef HAVE_SNDTIMEO
+ if (ptr->root->snd_timeout)
{
int error;
{
int error;
- struct linger linger;
struct timeval waittime;
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);
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);
}
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)
{
if (ptr->root->flags & MEM_TCP_NODELAY)
{
@@
-150,6
+173,8
@@
test_connect:
}
}
}
}
}
}
+
+ WATCHPOINT_ASSERT(ptr->fd != -1);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-159,10
+184,16
@@
static memcached_return network_connect(memcached_server_st *ptr)
{
struct addrinfo *use;
{
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;
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
@@
-170,7
+201,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
rc= set_hostinfo(ptr);
if (rc != MEMCACHED_SUCCESS)
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;
}
use= ptr->address_info;
@@
-207,13
+238,26
@@
test_connect:
fds[0].events= POLLOUT | POLLERR;
error= poll(fds, 1, ptr->root->connect_timeout);
fds[0].events= POLLOUT | POLLERR;
error= poll(fds, 1, ptr->root->connect_timeout);
- if (error != 1)
+ if (error == 0)
+ {
+ goto handle_retry;
+ }
+ else if (error != 1 && fds[0].revents & POLLERR)
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
WATCHPOINT_NUMBER(ptr->root->connect_timeout);
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
WATCHPOINT_NUMBER(ptr->root->connect_timeout);
- close(ptr->fd);
- ptr->fd= -1;
+ memcached_quit_server(ptr, 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;
+ }
+ ptr->server_failure_counter+= 1;
+
return MEMCACHED_ERRNO;
}
return MEMCACHED_ERRNO;
}
@@
-225,8
+269,8
@@
test_connect:
case EISCONN: /* We were spinning waiting on connect */
break;
default:
case EISCONN: /* We were spinning waiting on connect */
break;
default:
+handle_retry:
ptr->cached_errno= errno;
ptr->cached_errno= errno;
- WATCHPOINT_ERRNO(ptr->cached_errno);
close(ptr->fd);
ptr->fd= -1;
if (ptr->root->retry_timeout)
close(ptr->fd);
ptr->fd= -1;
if (ptr->root->retry_timeout)
@@
-241,15
+285,19
@@
test_connect:
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() */
}
@@
-285,9
+333,6
@@
memcached_return memcached_connect(memcached_server_st *ptr)
WATCHPOINT_ASSERT(0);
}
WATCHPOINT_ASSERT(0);
}
- if (rc != MEMCACHED_SUCCESS)
- WATCHPOINT_ERROR(rc);
-
LIBMEMCACHED_MEMCACHED_CONNECT_END();
return rc;
LIBMEMCACHED_MEMCACHED_CONNECT_END();
return rc;