From 2bf85951c6c25aa17acc591fabc3b3927b6dc82f Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Mon, 30 Mar 2015 16:56:59 +0530 Subject: Upcall: Process each of the upcall events separately As suggested during the code-review of Bug1200262, have modified GF_CBK_UPCALL to be exlusively GF_CBK_CACHE_INVALIDATION. Thus, for any new upcall event, a new CBK procedure will be added. Also made changes to store upcall data separately based on the upcall event type received. BUG: 1200262 Change-Id: I0f5e53d6f5ece16aecb514a0a426dca40fa1c755 Signed-off-by: Soumya Koduri Reviewed-on: http://review.gluster.org/10049 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- xlators/protocol/server/src/server.c | 114 ++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 43 deletions(-) (limited to 'xlators/protocol/server/src/server.c') diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 470c57dac41..bdb9bae9cb6 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -1113,74 +1113,102 @@ fini (xlator_t *this) return; } +int +server_process_event_upcall (xlator_t *this, void *data) +{ + int ret = -1; + server_conf_t *conf = NULL; + client_t *client = NULL; + char *client_uid = NULL; + struct gf_upcall *upcall_data = NULL; + void *up_req = NULL; + rpc_transport_t *xprt = NULL; + enum gf_cbk_procnum cbk_procnum = GF_CBK_NULL; + gfs3_cbk_cache_invalidation_req gf_c_req = {{0,},}; + xdrproc_t xdrproc; + + GF_VALIDATE_OR_GOTO(this->name, data, out); + + conf = this->private; + GF_VALIDATE_OR_GOTO(this->name, conf, out); + + upcall_data = (struct gf_upcall *)data; + + client_uid = upcall_data->client_uid; + + GF_VALIDATE_OR_GOTO(this->name, client_uid, out); + + switch (upcall_data->event_type) { + case GF_UPCALL_CACHE_INVALIDATION: + gf_proto_cache_invalidation_from_upcall (&gf_c_req, + upcall_data); + + up_req = &gf_c_req; + cbk_procnum = GF_CBK_CACHE_INVALIDATION; + xdrproc = (xdrproc_t)xdr_gfs3_cbk_cache_invalidation_req; + break; + default: + gf_log (this->name, GF_LOG_WARNING, + "Received invalid upcall event(%d)", + upcall_data->event_type); + goto out; + } + + pthread_mutex_lock (&conf->mutex); + { + list_for_each_entry (xprt, &conf->xprt_list, list) { + client = xprt->xl_private; + + if (strcmp(client->client_uid, client_uid)) + continue; + + rpcsvc_request_submit(conf->rpc, xprt, + &server_cbk_prog, + cbk_procnum, + up_req, + this->ctx, + xdrproc); + break; + } + } + pthread_mutex_unlock (&conf->mutex); + ret = 0; +out: + return ret; +} + int notify (xlator_t *this, int32_t event, void *data, ...) { - int ret = 0; + int ret = -1; int32_t val = 0; dict_t *dict = NULL; dict_t *output = NULL; va_list ap; - client_t *client = NULL; - char *client_uid = NULL; - struct gf_upcall *upcall_data = NULL; - gfs3_upcall_req up_req; - server_conf_t *conf = NULL; - rpc_transport_t *xprt = NULL; dict = data; va_start (ap, data); output = va_arg (ap, dict_t*); va_end (ap); - conf = this->private; - if (!conf) - return 0; - switch (event) { case GF_EVENT_UPCALL: { - if (!data) { - ret = -1; - goto out; - } - - upcall_data = (struct gf_upcall *)data; + GF_VALIDATE_OR_GOTO(this->name, data, out); - client_uid = upcall_data->client_uid; - - if (!client_uid) { - ret = -1; + ret = server_process_event_upcall (this, data); + if (ret) { + gf_log (this->name, GF_LOG_ERROR, + "server_process_event_upcall failed"); goto out; } - - gf_proto_upcall_from_upcall (&up_req, upcall_data); - - pthread_mutex_lock (&conf->mutex); - { - list_for_each_entry (xprt, &conf->xprt_list, list) { - client = xprt->xl_private; - - if (strcmp(client->client_uid, client_uid)) - continue; - - rpcsvc_request_submit( - conf->rpc, xprt, - &server_cbk_prog, - GF_CBK_UPCALL, - &up_req, - this->ctx, - (xdrproc_t)xdr_gfs3_upcall_req); - break; - } - } - pthread_mutex_unlock (&conf->mutex); break; } default: default_notify (this, event, data); break; } + ret = 0; out: return ret; } -- cgit