summaryrefslogtreecommitdiffstats
path: root/rpc/xdr/src/glusterfs3.h
diff options
context:
space:
mode:
authorPoornima G <pgurusid@redhat.com>2016-06-05 00:06:11 -0400
committerRaghavendra G <rgowdapp@redhat.com>2016-06-10 04:03:40 -0700
commit3bc419d8014877f64e57dc3368b0609396ec0d12 (patch)
tree54b658168400585a1e6d9848c6355d462603a9c2 /rpc/xdr/src/glusterfs3.h
parenta837357c5c7873bf19155e76bf6c251fa799a605 (diff)
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 <pgurusid@redhat.com> Reviewed-on: http://review.gluster.org/14647 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'rpc/xdr/src/glusterfs3.h')
-rw-r--r--rpc/xdr/src/glusterfs3.h30
1 files changed, 23 insertions, 7 deletions
diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h
index 5e1f516..1977b48 100644
--- a/rpc/xdr/src/glusterfs3.h
+++ b/rpc/xdr/src/glusterfs3.h
@@ -204,11 +204,12 @@ gf_proto_lease_from_lease (struct gf_proto_lease *gf_proto_lease, struct gf_leas
memcpy (gf_proto_lease->lease_id, gf_lease->lease_id, LEASE_ID_SIZE);
}
-static inline void
+static inline int
gf_proto_recall_lease_to_upcall (struct gfs3_recall_lease_req *recall_lease,
struct gf_upcall *gf_up_data)
{
struct gf_upcall_recall_lease *tmp = NULL;
+ int ret = 0;
GF_VALIDATE_OR_GOTO(THIS->name, recall_lease, out);
GF_VALIDATE_OR_GOTO(THIS->name, gf_up_data, out);
@@ -216,25 +217,40 @@ gf_proto_recall_lease_to_upcall (struct gfs3_recall_lease_req *recall_lease,
tmp = (struct gf_upcall_recall_lease *)gf_up_data->data;
tmp->lease_type = recall_lease->lease_type;
memcpy (gf_up_data->gfid, recall_lease->gfid, 16);
+ memcpy (tmp->tid, recall_lease->tid, 16);
+
+ GF_PROTOCOL_DICT_UNSERIALIZE (THIS, tmp->dict,
+ (recall_lease->xdata).xdata_val,
+ (recall_lease->xdata).xdata_len, ret,
+ errno, out);
out:
- return;
+ return ret;
}
-static inline void
-gf_proto_recall_lease_from_upcall (struct gfs3_recall_lease_req *recall_lease,
+static inline int
+gf_proto_recall_lease_from_upcall (xlator_t *this,
+ struct gfs3_recall_lease_req *recall_lease,
struct gf_upcall *gf_up_data)
{
struct gf_upcall_recall_lease *tmp = NULL;
+ int ret = 0;
- GF_VALIDATE_OR_GOTO(THIS->name, recall_lease, out);
- GF_VALIDATE_OR_GOTO(THIS->name, gf_up_data, out);
+ GF_VALIDATE_OR_GOTO(this->name, recall_lease, out);
+ GF_VALIDATE_OR_GOTO(this->name, gf_up_data, out);
tmp = (struct gf_upcall_recall_lease *)gf_up_data->data;
recall_lease->lease_type = tmp->lease_type;
memcpy (recall_lease->gfid, gf_up_data->gfid, 16);
+ memcpy (recall_lease->tid, tmp->tid, 16);
+
+ GF_PROTOCOL_DICT_SERIALIZE (this, tmp->dict,
+ &(recall_lease->xdata).xdata_val,
+ (recall_lease->xdata).xdata_len, ret, out);
+ if (ret > 0)
+ ret = -ret;
out:
- return;
+ return ret;
}