glusterd/Volume Lock: Corrupted Txn Id Fix

Change-Id: Ic988ffeb26a49b4c6ac0d4a8ca33124f2192744c
BUG: 1064768
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/6997
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Tested-by: Rajesh Joseph <rjoseph@redhat.com>

4 files changed, 33 insertions, 5 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 05e9596f7..e7024bd99 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -613,7 +613,7 @@ glusterd_op_txn_begin (rpcsvc_request_t *req, glusterd_op_t op, void *ctx,
         uuid_generate (*txn_id);
 
         ret = dict_set_bin (dict, "transaction_id",
-                            txn_id, sizeof (uuid_t));
+                            txn_id, sizeof(*txn_id));
         if (ret) {
                 gf_log (this->name, GF_LOG_ERROR,
                        "Failed to set transaction id.");
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 88c8858de..c0c72445b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -3353,7 +3353,7 @@ glusterd_op_start_rb_timer (dict_t *dict, uuid_t *txn_id)
         }
 
         ret = dict_set_bin (rb_ctx, "transaction_id",
-                            txn_id, sizeof (uuid_t));
+                            txn_id, sizeof(*txn_id));
         if (ret) {
                 gf_log ("", GF_LOG_ERROR,
                        "Failed to set transaction id.");
@@ -4194,7 +4194,7 @@ glusterd_op_ac_stage_op (glusterd_op_sm_event_t *event, void *ctx)
                 gf_log (this->name, GF_LOG_ERROR, "Out of Memory");
 
         ret = dict_set_bin (rsp_dict, "transaction_id",
-                            txn_id, sizeof(uuid_t *));
+                            txn_id, sizeof(*txn_id));
         if (ret)
                 gf_log (this->name, GF_LOG_ERROR,
                        "Failed to set transaction id.");
@@ -4301,7 +4301,7 @@ glusterd_op_ac_commit_op (glusterd_op_sm_event_t *event, void *ctx)
                 gf_log (this->name, GF_LOG_ERROR, "Out of Memory");
 
         ret = dict_set_bin (rsp_dict, "transaction_id",
-                            txn_id, sizeof(uuid_t));
+                            txn_id, sizeof(*txn_id));
         if (ret)
                 gf_log (this->name, GF_LOG_ERROR,
                        "Failed to set transaction id.");
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
index 821da33be..4925b9af7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
@@ -1404,6 +1404,7 @@ glusterd_vol_lock (call_frame_t *frame, xlator_t *this,
         glusterd_conf_t                 *priv        = NULL;
         call_frame_t                    *dummy_frame = NULL;
         dict_t                          *dict        = NULL;
+        uuid_t                          *txn_id      = NULL;
 
         if (!this)
                 goto out;
@@ -1430,6 +1431,19 @@ glusterd_vol_lock (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
+        /* Sending valid transaction ID to peers */
+        ret = dict_get_bin (dict, "transaction_id",
+                            (void **)&txn_id);
+        if (ret) {
+                gf_log (this->name, GF_LOG_ERROR,
+                       "Failed to get transaction id.");
+                goto out;
+        } else {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Transaction_id = %s", uuid_utoa (*txn_id));
+                uuid_copy (req.txn_id, *txn_id);
+        }
+
         dummy_frame = create_frame (this, this->ctx->pool);
         if (!dummy_frame)
                 goto out;
@@ -1454,6 +1468,7 @@ glusterd_vol_unlock (call_frame_t *frame, xlator_t *this,
         glusterd_conf_t                 *priv        = NULL;
         call_frame_t                    *dummy_frame = NULL;
         dict_t                          *dict        = NULL;
+        uuid_t                          *txn_id      = NULL;
 
         if (!this)
                 goto out;
@@ -1480,6 +1495,19 @@ glusterd_vol_unlock (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
+        /* Sending valid transaction ID to peers */
+        ret = dict_get_bin (dict, "transaction_id",
+                            (void **)&txn_id);
+        if (ret) {
+                gf_log (this->name, GF_LOG_ERROR,
+                       "Failed to get transaction id.");
+                goto out;
+        } else {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Transaction_id = %s", uuid_utoa (*txn_id));
+                uuid_copy (req.txn_id, *txn_id);
+        }
+
         dummy_frame = create_frame (this, this->ctx->pool);
         if (!dummy_frame)
                 goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c
index fe3cb1f33..cb8f5862f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-syncop.c
+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c
@@ -1462,7 +1462,7 @@ gd_sync_task_begin (dict_t *op_ctx, rpcsvc_request_t * req)
         uuid_generate (*txn_id);
 
         ret = dict_set_bin (op_ctx, "transaction_id",
-                            txn_id, sizeof (uuid_t));
+                            txn_id, sizeof(*txn_id));
         if (ret) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "Failed to set transaction id.");