locks: added inodelk/entrylk contention upcall notifications

The locks xlator now is able to send a contention notification to
the current owner of the lock.

This is only a notification that can be used to improve performance
of some client side operations that might benefit from extended
duration of lock ownership. Nothing is done if the lock owner decides
to ignore the message and to not release the lock. For forced
release of acquired resources, leases must be used.

Change-Id: I7f1ad32a0b4b445505b09908a050080ad848f8e0
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>

4 files changed, 179 insertions, 0 deletions

diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index aee34302205..aafd94400c6 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -150,6 +150,8 @@ enum gf_cbk_procnum {
         GF_CBK_CHILD_DOWN,
         GF_CBK_RECALL_LEASE,
         GF_CBK_STATEDUMP,
+        GF_CBK_INODELK_CONTENTION,
+        GF_CBK_ENTRYLK_CONTENTION,
         GF_CBK_MAXVALUE,
 };
 
diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h
index 2da5594a347..eef39416b5c 100644
--- a/rpc/xdr/src/glusterfs3.h
+++ b/rpc/xdr/src/glusterfs3.h
@@ -419,6 +419,162 @@ gf_proto_cache_invalidation_to_upcall (xlator_t *this,
         return ret;
 }
 
+static inline int
+gf_proto_inodelk_contention_to_upcall (struct gfs4_inodelk_contention_req *lc,
+                                       struct gf_upcall *gf_up_data)
+{
+        struct gf_upcall_inodelk_contention *tmp = NULL;
+        xlator_t *this                           = NULL;
+        int    ret                               = -1;
+        int    op_errno                          = EINVAL;
+
+        this = THIS;
+
+        GF_VALIDATE_OR_GOTO(this->name, lc, out);
+        GF_VALIDATE_OR_GOTO(this->name, gf_up_data, out);
+
+        tmp = (struct gf_upcall_inodelk_contention *)gf_up_data->data;
+
+        gf_uuid_copy(gf_up_data->gfid, (unsigned char *)lc->gfid);
+
+        gf_proto_flock_to_flock(&lc->flock, &tmp->flock);
+        tmp->pid = lc->pid;
+        tmp->domain = lc->domain;
+        if ((tmp->domain != NULL) && (*tmp->domain == 0)) {
+                tmp->domain = NULL;
+        }
+
+        GF_PROTOCOL_DICT_UNSERIALIZE (this, tmp->xdata, lc->xdata.xdata_val,
+                                      lc->xdata.xdata_len, ret, op_errno, out);
+
+        ret = 0;
+
+out:
+        if (ret < 0) {
+                ret = -op_errno;
+        }
+
+        return ret;
+}
+
+static inline int
+gf_proto_inodelk_contention_from_upcall (xlator_t *this,
+                                         struct gfs4_inodelk_contention_req *lc,
+                                         struct gf_upcall *gf_up_data)
+{
+        struct gf_upcall_inodelk_contention *tmp = NULL;
+        int    ret                               = -1;
+        int    op_errno                          = EINVAL;
+
+        GF_VALIDATE_OR_GOTO(this->name, lc, out);
+        GF_VALIDATE_OR_GOTO(this->name, gf_up_data, out);
+
+        tmp = (struct gf_upcall_inodelk_contention *)gf_up_data->data;
+
+        gf_uuid_copy((unsigned char *)lc->gfid, gf_up_data->gfid);
+
+        gf_proto_flock_from_flock(&lc->flock, &tmp->flock);
+        lc->pid = tmp->pid;
+        lc->domain = (char *)tmp->domain;
+        if (lc->domain == NULL) {
+                lc->domain = "";
+        }
+
+        GF_PROTOCOL_DICT_SERIALIZE (this, tmp->xdata, &lc->xdata.xdata_val,
+                                    lc->xdata.xdata_len, op_errno, out);
+
+        ret = 0;
+
+out:
+        if (ret < 0) {
+                ret = -op_errno;
+        }
+
+        return ret;
+}
+
+static inline int
+gf_proto_entrylk_contention_to_upcall (struct gfs4_entrylk_contention_req *lc,
+                                       struct gf_upcall *gf_up_data)
+{
+        struct gf_upcall_entrylk_contention *tmp = NULL;
+        xlator_t *this                           = NULL;
+        int    ret                               = -1;
+        int    op_errno                          = EINVAL;
+
+        this = THIS;
+
+        GF_VALIDATE_OR_GOTO(this->name, lc, out);
+        GF_VALIDATE_OR_GOTO(this->name, gf_up_data, out);
+
+        tmp = (struct gf_upcall_entrylk_contention *)gf_up_data->data;
+
+        gf_uuid_copy(gf_up_data->gfid, (unsigned char *)lc->gfid);
+
+        tmp->type = lc->type;
+        tmp->name = lc->name;
+        if ((tmp->name != NULL) && (*tmp->name == 0)) {
+                tmp->name = NULL;
+        }
+        tmp->pid = lc->pid;
+        tmp->domain = lc->domain;
+        if ((tmp->domain != NULL) && (*tmp->domain == 0)) {
+                tmp->domain = NULL;
+        }
+
+        GF_PROTOCOL_DICT_UNSERIALIZE (this, tmp->xdata, lc->xdata.xdata_val,
+                                      lc->xdata.xdata_len, ret, op_errno, out);
+
+        ret = 0;
+
+out:
+        if (ret < 0) {
+                ret = -op_errno;
+        }
+
+        return ret;
+}
+
+static inline int
+gf_proto_entrylk_contention_from_upcall (xlator_t *this,
+                                         struct gfs4_entrylk_contention_req *lc,
+                                         struct gf_upcall *gf_up_data)
+{
+        struct gf_upcall_entrylk_contention *tmp = NULL;
+        int    ret                               = -1;
+        int    op_errno                          = EINVAL;
+
+        GF_VALIDATE_OR_GOTO(this->name, lc, out);
+        GF_VALIDATE_OR_GOTO(this->name, gf_up_data, out);
+
+        tmp = (struct gf_upcall_entrylk_contention *)gf_up_data->data;
+
+        gf_uuid_copy((unsigned char *)lc->gfid, gf_up_data->gfid);
+
+        lc->type = tmp->type;
+        lc->name = (char *)tmp->name;
+        if (lc->name == NULL) {
+                lc->name = "";
+        }
+        lc->pid = tmp->pid;
+        lc->domain = (char *)tmp->domain;
+        if (lc->domain == NULL) {
+                lc->domain = "";
+        }
+
+        GF_PROTOCOL_DICT_SERIALIZE (this, tmp->xdata, &lc->xdata.xdata_val,
+                                    lc->xdata.xdata_len, op_errno, out);
+
+        ret = 0;
+
+out:
+        if (ret < 0) {
+                ret = -op_errno;
+        }
+
+        return ret;
+}
+
 extern int dict_to_xdr (dict_t *this, gfx_dict *xdict);
 extern int xdr_to_dict (gfx_dict *xdict, dict_t **to);
 
diff --git a/rpc/xdr/src/glusterfs4-xdr.x b/rpc/xdr/src/glusterfs4-xdr.x
index 7396b566fa7..ef0cfde0802 100644
--- a/rpc/xdr/src/glusterfs4-xdr.x
+++ b/rpc/xdr/src/glusterfs4-xdr.x
@@ -86,3 +86,20 @@ struct gfs4_namelink_req {
        string bname<>;
        opaque xdata<>;
 };
+
+struct gfs4_inodelk_contention_req {
+        opaque                gfid[16];
+        struct gf_proto_flock flock;
+        unsigned int          pid;
+        string                domain<>;
+        opaque                xdata<>;
+};
+
+struct gfs4_entrylk_contention_req {
+        opaque                gfid[16];
+        unsigned int          type;
+        unsigned int          pid;
+        string                name<>;
+        string                domain<>;
+        opaque                xdata<>;
+};
diff --git a/rpc/xdr/src/libgfxdr.sym b/rpc/xdr/src/libgfxdr.sym
index 8af956ef5a9..83f1efc732a 100644
--- a/rpc/xdr/src/libgfxdr.sym
+++ b/rpc/xdr/src/libgfxdr.sym
@@ -155,8 +155,12 @@ xdr_gfs3_xattrop_req
 xdr_gfs3_xattrop_rsp
 xdr_gfs3_zerofill_req
 xdr_gfs3_zerofill_rsp
+xdr_gfs4_entrylk_contention_req
+xdr_gfs4_entrylk_contention_rsp
 xdr_gfs4_icreate_req
 xdr_gfs4_icreate_rsp
+xdr_gfs4_inodelk_contention_req
+xdr_gfs4_inodelk_contention_rsp
 xdr_gfs4_namelink_req
 xdr_gfs4_namelink_rsp
 xdr_gf_set_lk_ver_req