From 3bc419d8014877f64e57dc3368b0609396ec0d12 Mon Sep 17 00:00:00 2001 From: Poornima G Date: Sun, 5 Jun 2016 00:06:11 -0400 Subject: protocol: Add framework to send transaction id with recall Issue: The upcall(cache invalidation/recall) event is sent from the bricks to clients. In AFR/EC setup, it can so happen that all the bricks will send the upcall for the same event, and if AFR/EC doesn't filter out these duplicate notifications, the logic above cluster xlators can fail. Solution: Use transaction id to filter out duplicate notifications. This patch adds framework for duplicate notifications. AFR/EC can build up on this patch for deduping the notifications Change-Id: I66b08e63b8799bc5932f2b2545376138a5701168 BUG: 1319992 Signed-off-by: Poornima G Reviewed-on: http://review.gluster.org/14647 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra Talur Reviewed-by: Raghavendra G --- xlators/protocol/client/src/client-callback.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'xlators/protocol/client') diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c index bedc8f6ec2b..134044015e4 100644 --- a/xlators/protocol/client/src/client-callback.c +++ b/xlators/protocol/client/src/client-callback.c @@ -63,7 +63,10 @@ client_cbk_recall_lease (struct rpc_clnt *rpc, void *mydata, void *data) } upcall_data.data = &rl_data; - gf_proto_recall_lease_to_upcall (&recall_lease, &upcall_data); + ret = gf_proto_recall_lease_to_upcall (&recall_lease, &upcall_data); + if (ret < 0) + goto out; + upcall_data.event_type = GF_UPCALL_RECALL_LEASE; gf_msg_trace (THIS->name, 0, "Upcall gfid = %s, ret = %d", @@ -72,6 +75,12 @@ client_cbk_recall_lease (struct rpc_clnt *rpc, void *mydata, void *data) default_notify (THIS, GF_EVENT_UPCALL, &upcall_data); out: + if (recall_lease.xdata.xdata_val) + free (recall_lease.xdata.xdata_val); + + if (rl_data.dict) + dict_unref (rl_data.dict); + return ret; } -- cgit