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-op-sm.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-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 5a23d2bf0c7..326968ea6b8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -3210,6 +3210,7 @@ glusterd_op_ac_lock (glusterd_op_sm_event_t *event, void *ctx) glusterd_op_lock_ctx_t *lock_ctx = NULL; glusterd_conf_t *priv = NULL; xlator_t *this = NULL; + uint32_t op_errno = 0; GF_ASSERT (event); GF_ASSERT (ctx); @@ -3232,7 +3233,7 @@ glusterd_op_ac_lock (glusterd_op_sm_event_t *event, void *ctx) "Unable to acquire volname"); else { ret = glusterd_mgmt_v3_lock (volname, lock_ctx->uuid, - "vol"); + &op_errno, "vol"); if (ret) gf_log (this->name, GF_LOG_ERROR, "Unable to acquire lock for %s", @@ -3242,7 +3243,7 @@ glusterd_op_ac_lock (glusterd_op_sm_event_t *event, void *ctx) ret = dict_get_str (lock_ctx->dict, "globalname", &globalname); if (!ret) { ret = glusterd_mgmt_v3_lock (globalname, lock_ctx->uuid, - "global"); + &op_errno, "global"); if (ret) gf_log (this->name, GF_LOG_ERROR, "Unable to acquire lock for %s", |