diff options
| author | anand <anekkunt@redhat.com> | 2015-06-08 00:19:00 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-07-13 04:33:31 -0700 |
| commit | 0497fb6090d1ed34ac1bdcaaff49847025d13e9e (patch) | |
| tree | 42788e2b47f0cb55b0fef0e1793177eeb29e0bc2 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 1e520ff415d50e3eeb6418710314fe61e8e78e35 (diff) | |
glusterd: Get the local txn_info based on trans_id in op_sm call backs.
Issue: when two or more transactions are running concurrently in op_sm,
global op_info might get corrupted.
Fix: Get local txn_info based on trans_id instead of using global txn_info for
commands (re-balance, profile ) which are using op_sm in originator.
TODO: Handle errors properly in call backs and completely remove the global op_info from
op_sm.
Backport of:
>Change-Id: I9d61388acc125841ddc77e2bd560cb7f17ae0a5a
>BUG: 1229139
>Signed-off-by: anand <anekkunt@redhat.com>
>Reviewed-on: http://review.gluster.org/11120
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
(cherry picked from commit c9765bcb1557ab1e921080e7de4f3ebac1e424d5)
Change-Id: I4405a4a1cf4c853b5d2ce478fd65043e45a79826
BUG: 1230523
Signed-off-by: anand <anekkunt@redhat.com>
Reviewed-on: http://review.gluster.org/11557
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index d970d6629ec..64736b1a546 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -7515,23 +7515,26 @@ glusterd_profile_volume_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) int32_t brick_count = 0; int32_t count = 0; dict_t *ctx_dict = NULL; - glusterd_op_t op = GD_OP_NONE; + xlator_t *this = NULL; GF_ASSERT (rsp_dict); + this = THIS; + GF_ASSERT (this); ret = dict_get_int32 (rsp_dict, "count", &brick_count); if (ret) { ret = 0; //no bricks in the rsp goto out; } - - op = glusterd_op_get_op (); - GF_ASSERT (GD_OP_PROFILE_VOLUME == op); if (aggr) { ctx_dict = aggr; } else { - ctx_dict = glusterd_op_get_ctx (); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_OPCTX_GET_FAIL, + "Operation Context is not present"); + ret = -1; + goto out; } ret = dict_get_int32 (ctx_dict, "count", &count); @@ -7954,7 +7957,6 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) dict_t *ctx_dict = NULL; double elapsed_time = 0; glusterd_conf_t *conf = NULL; - glusterd_op_t op = GD_OP_NONE; glusterd_peerinfo_t *peerinfo = NULL; glusterd_volinfo_t *volinfo = NULL; int ret = 0; @@ -7964,20 +7966,21 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) int32_t value32 = 0; uint64_t value = 0; char *peer_uuid_str = NULL; + xlator_t *this = NULL; GF_ASSERT (rsp_dict); - conf = THIS->private; - - op = glusterd_op_get_op (); - GF_ASSERT ((GD_OP_REBALANCE == op) || - (GD_OP_DEFRAG_BRICK_VOLUME == op)); + this = THIS; + GF_ASSERT (this); + conf = this->private; if (aggr) { ctx_dict = aggr; } else { - ctx_dict = glusterd_op_get_ctx (op); - + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_OPCTX_GET_FAIL, + "Operation Context is not present"); + goto out; } if (!ctx_dict) |