projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix test case for weighted servers.
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index de69e4465ef8c68e34d608f4bace32d4d0cd5042..c5157629670fddd9daa7b29deb5a5200fd3ceaf6 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;
@@
-45,9
+46,12
@@
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;
+#ifndef __sun
if (ptr->root->snd_timeout)
{
int error;
if (ptr->root->snd_timeout)
{
int error;
@@
-73,6
+77,7
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
+#endif
{
int error;
{
int error;
@@
-166,6
+171,8
@@
test_connect:
}
}
}
}
}
}
+
+ WATCHPOINT_ASSERT(ptr->fd != -1);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-183,10
+190,8
@@
static memcached_return network_connect(memcached_server_st *ptr)
return MEMCACHED_FAILURE;
}
}
return MEMCACHED_FAILURE;
}
}
- /* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->cursor_active == 0);
- 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;
@@
-194,7
+199,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;
@@
-235,27
+240,22
@@
test_connect:
{
goto handle_retry;
}
{
goto handle_retry;
}
- else if (error != 1
||
fds[0].revents & POLLERR)
+ 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;
- if (ptr->address_info)
- {
- freeaddrinfo(ptr->address_info);
- ptr->address_info= NULL;
- }
+ memcached_quit_server(ptr, 1);
- if (ptr->root->retry_timeout)
- {
- struct timeval next_time;
+
if (ptr->root->retry_timeout)
+
{
+
struct timeval next_time;
- gettimeofday(&next_time, NULL);
- ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
- }
+
gettimeofday(&next_time, NULL);
+
ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+
}
ptr->server_failure_counter+= 1;
ptr->server_failure_counter+= 1;
+
return MEMCACHED_ERRNO;
}
return MEMCACHED_ERRNO;
}