summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Lambright <dlambrig@redhat.com>2016-05-11 13:51:57 -0400
committerDan Lambright <dlambrig@redhat.com>2016-05-13 11:01:31 -0700
commit93dd9a34e9cad915ba0f99ac1cc383fc4ec129ff (patch)
tree0c2bbf080fcb7b848479d6ad8b13ee1b216a3371
parentff7f6fc82cfe3a6af4bf3f339c31843a0e9c9b28 (diff)
cluster/tier: return -1 to cli on detach commit when detach unfinished
If we try to commit a detach tier before it is finished, we should flag an error. This patch adds a return value -1 for this case to be propagated back to the CLI. Change-Id: I619dbe662b2fd06ebdd97702b2d223560017db51 BUG: 1335792 Signed-off-by: Dan Lambright <dlambrig@redhat.com> Reviewed-on: http://review.gluster.org/14327 Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index 48af980c3e5..7a6e967151c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -2133,6 +2133,7 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr)
"retry after completion");
gf_msg (this->name, GF_LOG_ERROR, 0,
GD_MSG_OIP_RETRY_LATER, "%s", errstr);
+ ret = -1;
goto out;
}
break;