diff options
| author | Ashish Pandey <aspandey@redhat.com> | 2015-06-16 15:18:50 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-07-07 01:54:28 -0700 |
| commit | e5f241c9f4a9adc969d13288bd823a9a9aa2c469 (patch) | |
| tree | 1e5875930d72666391fed772d8e1731b30de0094 | |
| parent | 662166777a98564ec618104f8378bf0f22cc1b63 (diff) | |
glusterd: Correction in Error message for disperse
volume create
Problem: If all the bricks are on same server and
creating "disperse" volume without using "force",
it throws a failure message mentioning "replicate"
as volume.
Solution: Adding failure message for disperse volume too
Change-Id: I9e466b1fe9dae8cf556903b1a2c4f0b270159841
BUG: 1232185
Signed-off-by: Ashish Pandey <aspandey@redhat.com>
Reviewed-on: http://review.gluster.org/11251
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index a1aa9595b5e..f95c8280345 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -101,7 +101,7 @@ glusterd_check_brick_order(dict_t *dict, char *err_str) const char failed_string[2048] = "Failed to perform brick order " "check. Use 'force' at the end of the command" " if you want to override this behavior. "; - const char found_string[2048] = "Multiple bricks of a replicate " + const char found_string[2048] = "Multiple bricks of a %s " "volume are present on the same server. This " "setup is not optimal. Use 'force' at the " "end of the command if you want to override " @@ -248,7 +248,12 @@ check_failed: found_bad_brick_order: gf_msg (this->name, GF_LOG_INFO, 0, GD_MSG_BAD_BRKORDER, "Bad brick order found"); - snprintf (err_str, sizeof (found_string), found_string); + if (type == GF_CLUSTER_TYPE_DISPERSE) { + snprintf (err_str, sizeof (found_string), found_string, "disperse"); + } else { + snprintf (err_str, sizeof (found_string), found_string, "replicate"); + } + ret = -1; out: ai_list_tmp2 = NULL; |