|
 |
12a457 |
From 4a665fa5e14c33bc91ee38f5974499262d944de9 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Dan Lambright <dlambrig@redhat.com>
|
|
|
12a457 |
Date: Wed, 11 May 2016 13:51:57 -0400
|
|
|
12a457 |
Subject: [PATCH 149/158] cluster/tier: return -1 to cli on detach commit when detach unfinished
|
|
|
12a457 |
|
|
|
12a457 |
If we try to commit a detach tier before it is finished, we should
|
|
|
12a457 |
flag an error. This patch adds a return value -1 for this case to
|
|
|
12a457 |
be propagated back to the CLI.
|
|
|
12a457 |
|
|
|
12a457 |
This is a backport of patch 14237.
|
|
|
12a457 |
|
|
|
12a457 |
> Change-Id: I619dbe662b2fd06ebdd97702b2d223560017db51
|
|
|
12a457 |
> BUG: 1335792
|
|
|
12a457 |
> Signed-off-by: Dan Lambright <dlambrig@redhat.com>
|
|
|
12a457 |
> Reviewed-on: http://review.gluster.org/14327
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I619dbe662b2fd06ebdd97702b2d223560017db51
|
|
|
12a457 |
BUG: 1335082
|
|
|
12a457 |
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/74126
|
|
|
12a457 |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Tested-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 1 +
|
|
|
12a457 |
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
|
|
|
12a457 |
index 547b82d..d27ea2b 100644
|
|
|
12a457 |
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
|
|
|
12a457 |
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
|
|
|
12a457 |
@@ -2133,6 +2133,7 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr)
|
|
|
12a457 |
"retry after completion");
|
|
|
12a457 |
gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
12a457 |
GD_MSG_OIP_RETRY_LATER, "%s", errstr);
|
|
|
12a457 |
+ ret = -1;
|
|
|
12a457 |
goto out;
|
|
|
12a457 |
}
|
|
|
12a457 |
break;
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|