andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

per frame time out - i.e individual frames are unwound instead of the transport point itself being disconnected. timeout is configured using "transport-timeout".

Browse Source 
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
This commit is contained in:
Krishna Srinivas 2009-02-24 06:52:55 -08:00 committed by Anand V. Avati
parent ab7fe2987f
commit 8479df9809
3 changed files with 116 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
xlators/protocol/client/src/client-protocol.c
View File

@ -43,7 +43,7 @@
/* for default_*_cbk functions */
#include "defaults.c"
#include "saved-frames.h"
#include "common-utils.h"
int protocol_client_cleanup (transport_t *trans);
int protocol_client_interpret (xlator_t *this, transport_t *trans,
@ -255,8 +255,18 @@ call_bail (void *data)
{
client_connection_t *conn = NULL;
struct timeval current;
int32_t bail_out = 0;
transport_t *trans = NULL;
struct list_head list;
struct saved_frame *saved_frame = NULL;
struct saved_frame *trav = NULL;
struct saved_frame *tmp = NULL;
call_frame_t *frame = NULL;
gf_hdr_common_t hdr = {0, };
dict_t *reply = NULL;
char **gf_op_list = NULL;
gf_op_t *gf_ops = NULL;
struct tm frame_sent_tm;
char frame_sent[32] = {0,};
GF_VALIDATE_OR_GOTO("client", data, out);
trans = data;
@ -264,6 +274,8 @@ call_bail (void *data)
conn = trans->xl_private;
gettimeofday (&current, NULL);
INIT_LIST_HEAD (&list);
pthread_mutex_lock (&conn->lock);
{
/* Chaining to get call-always functionality from
@ -286,46 +298,84 @@ call_bail (void *data)
}
}
if (((conn->saved_frames->count > 0) &&
(RECEIVE_TIMEOUT(conn, current)) &&
(SEND_TIMEOUT(conn, current)))) {
/* TODO while(1) is not nice - use splice */
struct tm last_sent_tm, last_received_tm;
char last_sent[32] = {0,}, last_received[32] = {0,};
do {
saved_frame =
saved_frames_get_timedout (conn->saved_frames,
GF_OP_TYPE_MOP_REQUEST,
conn->transport_timeout,
&current);
if (saved_frame)
list_add (&saved_frame->list, &list);
bail_out = 1;
} while (saved_frame);
localtime_r (&conn->last_sent.tv_sec,
&last_sent_tm);
localtime_r (&conn->last_received.tv_sec,
&last_received_tm);
do {
saved_frame =
saved_frames_get_timedout (conn->saved_frames,
GF_OP_TYPE_FOP_REQUEST,
conn->transport_timeout,
&current);
if (saved_frame)
list_add (&saved_frame->list, &list);
} while (saved_frame);
strftime (last_sent, 32,
"%Y-%m-%d %H:%M:%S", &last_sent_tm);
strftime (last_received, 32,
"%Y-%m-%d %H:%M:%S", &last_received_tm);
gf_log (trans->xl->name, GF_LOG_ERROR,
"activating bail-out. pending frames = %d. "
"last sent = %s. last received = %s. "
"transport-timeout = %d",
(int32_t) conn->saved_frames->count,
last_sent, last_received,
conn->transport_timeout);
do {
saved_frame =
saved_frames_get_timedout (conn->saved_frames,
GF_OP_TYPE_CBK_REQUEST,
conn->transport_timeout,
&current);
if (saved_frame)
list_add (&saved_frame->list, &list);
} while (saved_frame);
}
}
if (bail_out) {
conn->ping_started = 0;
}
pthread_mutex_unlock (&conn->lock);
if (bail_out) {
gf_log (trans->xl->name, GF_LOG_CRITICAL,
"bailing transport");
transport_disconnect (trans);
reply = get_new_dict();
dict_ref (reply);
hdr.rsp.op_ret = hton32 (-1);
hdr.rsp.op_errno = hton32 (ENOTCONN);
list_for_each_entry_safe (trav, tmp, &list, list) {
switch (trav->type)
{
case GF_OP_TYPE_FOP_REQUEST:
gf_ops = gf_fops;
gf_op_list = gf_fop_list;
break;
case GF_OP_TYPE_MOP_REQUEST:
gf_ops = gf_mops;
gf_op_list = gf_mop_list;
break;
case GF_OP_TYPE_CBK_REQUEST:
gf_ops = gf_cbks;
gf_op_list = gf_cbk_list;
break;
}
localtime_r (&trav->saved_at.tv_sec, &frame_sent_tm);
strftime (frame_sent, 32, "%Y-%m-%d %H:%M:%S", &frame_sent_tm);
gf_log (trans->xl->name, GF_LOG_ERROR,
"activating bail-out :"
"frame sent = %s. transport-timeout = %d",
frame_sent, conn->transport_timeout);
hdr.type = hton32 (trav->type);
hdr.op = hton32 (trav->op);
frame = trav->frame;
frame->root->rsp_refs = reply;
gf_ops[trav->op] (frame, &hdr, sizeof (hdr), NULL, 0);
list_del_init (&trav->list);
FREE (trav);
}
dict_unref (reply);
out:
return;
}
@ -398,7 +448,6 @@ client_get_forgets (xlator_t *this, client_forget_t *forget)
return ret;
}
void
client_ping_timer_expired (void *data)
{

24
xlators/protocol/client/src/saved-frames.c
View File

@ -87,9 +87,9 @@ saved_frames_put (struct saved_frames *frames, call_frame_t *frame,
saved_frame->type = type;
saved_frame->callid = callid;
// gettimeofday (&saved_frame->saved_at, NULL);
gettimeofday (&saved_frame->saved_at, NULL);
list_add (&saved_frame->list, &head_frame->list);
list_add_tail (&saved_frame->list, &head_frame->list);
frames->count++;
return 0;
@ -124,6 +124,26 @@ saved_frames_get (struct saved_frames *frames, int32_t op,
return frame;
}
struct saved_frame *
saved_frames_get_timedout (struct saved_frames *frames, int8_t type,
uint32_t timeout, struct timeval *current)
{
struct saved_frame *bailout_frame = NULL, *tmp = NULL;
struct saved_frame *head_frame = NULL;
head_frame = get_head_frame_for_type (frames, type);
if (!list_empty(&head_frame->list)) {
tmp = list_entry (head_frame->list.next, typeof (*tmp), list);
if ((tmp->saved_at.tv_sec + timeout) < current->tv_sec) {
bailout_frame = tmp;
list_del_init (&bailout_frame->list);
frames->count--;
}
}
return bailout_frame;
}
void
saved_frames_unwind (xlator_t *this, struct saved_frames *saved_frames,

5
xlators/protocol/client/src/saved-frames.h
View File

@ -67,6 +67,11 @@ int saved_frames_put (struct saved_frames *frames, call_frame_t *frame,
int32_t op, int8_t type, int64_t callid);
call_frame_t *saved_frames_get (struct saved_frames *frames, int32_t op,
int8_t type, int64_t callid);
struct saved_frame *
saved_frames_get_timedout (struct saved_frames *frames, int8_t type,
uint32_t timeout, struct timeval *current);
void saved_frames_destroy (xlator_t *this, struct saved_frames *frames,
gf_op_t gf_fops[], gf_op_t gf_mops[],
gf_op_t gf_cbks[]);