diff options
| author | hari gowtham <hgowtham@redhat.com> | 2015-09-15 14:57:24 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-09-18 08:35:46 -0700 |
| commit | f139283f32e7f3dad7db0b2e3f802f3708084b43 (patch) | |
| tree | 2e04fa50308dcca5970c1b862069ae4674d8f63c | |
| parent | 687f0757c96b7096398de71d908cd77f5a73da0d (diff) | |
Tiering:Changing error message as detach-tier instead of "remove-brick"
backport of : http://review.gluster.org/#/c/12177/
>Change-Id: Id93424a08f601a8d7540d96a47ed2b0497d4a631
>BUG: 1263177
>Signed-off-by: hari gowtham <hgowtham@redhat.com>
>Reviewed-on: http://review.gluster.org/12177
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Dan Lambright <dlambrig@redhat.com>
>Tested-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: Iec787eec7ece0a88675d25eea9309a5bfc14cd49
BUG: 1258244
Signed-off-by: Hari Gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/12190
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 08bda17acfa..cea4d26c56b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1867,10 +1867,19 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) } if (GLUSTERD_STATUS_STARTED != volinfo->status) { - snprintf (msg, sizeof (msg), "Volume %s needs to be " - "started before remove-brick (you can use " - "'force' or 'commit' to override this " - "behavior)", volinfo->volname); + if (volinfo->type == GF_CLUSTER_TYPE_TIER) { + snprintf (msg, sizeof (msg), "Volume %s needs " + "to be started before detach-tier " + "(you can use 'force' or 'commit' " + "to override this behavior)", + volinfo->volname); + } else { + snprintf (msg, sizeof (msg), "Volume %s needs " + "to be started before remove-brick " + "(you can use 'force' or 'commit' " + "to override this behavior)", + volinfo->volname); + } errstr = gf_strdup (msg); gf_msg (this->name, GF_LOG_ERROR, 0, GD_MSG_VOL_NOT_STARTED, "%s", errstr); |