From a12da1b2111c87e4da3faae6ac17acfc22c70dbc Mon Sep 17 00:00:00 2001
From: Ashish Pandey <aspandey@redhat.com>
Date: Tue, 16 Jun 2015 15:18:50 +0530
Subject: [PATCH 188/190] 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
 Review link for master -
 http://review.gluster.org/11250/

Change-Id: I9e466b1fe9dae8cf556903b1a2c4f0b270159841
BUG: 1223225
Signed-off-by: Ashish Pandey <aspandey@redhat.com>

Signed-off-by: Ashish Pandey <aspandey@redhat.com>
Change-Id: I490dad35caa13feec3000d061b48deff59a9cff4
Reviewed-on: https://code.engineering.redhat.com/gerrit/51762
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
---
 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 a65495d..2ad1614 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;
-- 
1.7.1