summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorSoumya Koduri <skoduri@redhat.com>2015-03-30 16:56:59 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-04-30 04:51:46 -0700
commit2bf85951c6c25aa17acc591fabc3b3927b6dc82f (patch)
tree8db692b3c4f833f3a075cb5fb58195dda9004280 /xlators/protocol
parent288e02853d913b96e4d6bce9afb16da7d891546f (diff)
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 <skoduri@redhat.com> Reviewed-on: http://review.gluster.org/10049 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client-callback.c34
-rw-r--r--xlators/protocol/server/src/server-helpers.h1
-rw-r--r--xlators/protocol/server/src/server.c114
3 files changed, 93 insertions, 56 deletions
diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c
index fdfb3dc313b..722db7d0f5f 100644
--- a/xlators/protocol/client/src/client-callback.c
+++ b/xlators/protocol/client/src/client-callback.c
@@ -42,30 +42,36 @@ client_cbk_ino_flush (struct rpc_clnt *rpc, void *mydata, void *data)
}
int
-client_cbk_upcall (struct rpc_clnt *rpc, void *mydata, void *data)
+client_cbk_cache_invalidation (struct rpc_clnt *rpc, void *mydata, void *data)
{
- int ret = -1;
- gfs3_upcall_req up_req;
- struct gf_upcall upcall_data;
- struct iovec *iov = NULL;
+ int ret = -1;
+ struct iovec *iov = NULL;
+ struct gf_upcall upcall_data = {0,};
+ uuid_t gfid;
+ struct gf_upcall_cache_invalidation ca_data = {0,};
+ gfs3_cbk_cache_invalidation_req ca_req = {{0,},};
- gf_log (THIS->name, GF_LOG_TRACE,
- "Upcall callback is called");
+ gf_log (THIS->name, GF_LOG_TRACE, "Upcall callback is called");
if (!rpc || !mydata || !data)
goto out;
iov = (struct iovec *)data;
- ret = xdr_to_generic (*iov, &up_req,
- (xdrproc_t)xdr_gfs3_upcall_req);
+ ret = xdr_to_generic (*iov, &ca_req,
+ (xdrproc_t)xdr_gfs3_cbk_cache_invalidation_req);
- if (ret < 0)
+ if (ret < 0) {
+ gf_log (THIS->name, GF_LOG_WARNING,
+ "XDR decode of cache_invalidation failed.");
goto out;
+ }
- gf_proto_upcall_to_upcall (&up_req, &upcall_data);
+ upcall_data.data = &ca_data;
+ gf_proto_cache_invalidation_to_upcall (&ca_req, &upcall_data);
+ memcpy (gfid, ca_req.gfid, 16);
gf_log (THIS->name, GF_LOG_TRACE, "Upcall gfid = %s, ret = %d",
- (char *)(up_req.gfid), ret);
+ uuid_utoa (gfid), ret);
default_notify (THIS, GF_EVENT_UPCALL, &upcall_data);
@@ -77,7 +83,9 @@ rpcclnt_cb_actor_t gluster_cbk_actors[GF_CBK_MAXVALUE] = {
[GF_CBK_NULL] = {"NULL", GF_CBK_NULL, client_cbk_null },
[GF_CBK_FETCHSPEC] = {"FETCHSPEC", GF_CBK_FETCHSPEC, client_cbk_fetchspec },
[GF_CBK_INO_FLUSH] = {"INO_FLUSH", GF_CBK_INO_FLUSH, client_cbk_ino_flush },
- [GF_CBK_UPCALL] = {"UPCALL", GF_CBK_UPCALL, client_cbk_upcall },
+ [GF_CBK_CACHE_INVALIDATION] = {"CACHE_INVALIDATION",
+ GF_CBK_CACHE_INVALIDATION,
+ client_cbk_cache_invalidation },
};
diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h
index e7238d9ca6a..73b01b197e0 100644
--- a/xlators/protocol/server/src/server-helpers.h
+++ b/xlators/protocol/server/src/server-helpers.h
@@ -57,4 +57,5 @@ int auth_set_username_passwd (dict_t *input_params, dict_t *config_params,
struct _client_t *client);
server_ctx_t *server_ctx_get (client_t *client, xlator_t *xlator);
+int server_process_event_upcall (xlator_t *this, void *data);
#endif /* !_SERVER_HELPERS_H */
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
@@ -1114,73 +1114,101 @@ fini (xlator_t *this)
}
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;
}