diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2015-05-05 10:58:10 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-06-01 00:18:15 -0700 |
| commit | e9a37d5a3471db02e1c7922cee93bf290e2f326d (patch) | |
| tree | 8ebcebd20a6d00df8cf65cba448e64dc47e88f68 /xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c | |
| parent | de256912050bc3d41c6e5ea8b003cf50bd8c7399 (diff) | |
glusterd/snapshot: Return correct errno in events of failure - PATCH 1
Backport of patch http://review.gluster.org/#/c/10313/
RETCODE ERROR
-------------------------------------------
30800 Internal Error
30801 Another Transaction In Progress
>Change-Id: Ica7fd2e513b2c28717b6df73cfb2667725dbf057
>BUG: 1226117
>Signed-off-by: Avra Sengupta <asengupt@redhat.com>
>Reviewed-on: http://review.gluster.org/10313
>Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System
>Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
>(cherry picked from commit 4397d7e72fdff6f01c59b72eebea421f23c1a392)
Change-Id: Iace6ac0f150919cead94e6c5d99a23d28d45046e
BUG: 1226117
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11011
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c b/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c index db5a19bf675..9ebaf00d32f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c @@ -28,7 +28,8 @@ glusterd_mgmt_v3_null (rpcsvc_request_t *req) } static int -glusterd_mgmt_v3_lock_send_resp (rpcsvc_request_t *req, int32_t status) +glusterd_mgmt_v3_lock_send_resp (rpcsvc_request_t *req, int32_t status, + uint32_t op_errno) { gd1_mgmt_v3_lock_rsp rsp = {{0},}; @@ -41,7 +42,7 @@ glusterd_mgmt_v3_lock_send_resp (rpcsvc_request_t *req, int32_t status) rsp.op_ret = status; if (rsp.op_ret) - rsp.op_errno = errno; + rsp.op_errno = op_errno; glusterd_get_uuid (&rsp.uuid); @@ -61,6 +62,7 @@ glusterd_synctasked_mgmt_v3_lock (rpcsvc_request_t *req, { int32_t ret = -1; xlator_t *this = NULL; + uint32_t op_errno = 0; this = THIS; GF_ASSERT (this); @@ -69,14 +71,14 @@ glusterd_synctasked_mgmt_v3_lock (rpcsvc_request_t *req, GF_ASSERT (ctx->dict); /* Trying to acquire multiple mgmt_v3 locks */ - ret = glusterd_multiple_mgmt_v3_lock (ctx->dict, ctx->uuid); + ret = glusterd_multiple_mgmt_v3_lock (ctx->dict, ctx->uuid, &op_errno); if (ret) gf_msg (this->name, GF_LOG_ERROR, 0, GD_MSG_MGMTV3_LOCK_GET_FAIL, "Failed to acquire mgmt_v3 locks for %s", uuid_utoa (ctx->uuid)); - ret = glusterd_mgmt_v3_lock_send_resp (req, ret); + ret = glusterd_mgmt_v3_lock_send_resp (req, ret, op_errno); gf_msg_trace (this->name, 0, "Returning %d", ret); return ret; |