diff options
| author | Raghavendra Bhat <raghavendrabhat@gluster.com> | 2011-05-02 05:36:17 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-05-11 19:18:12 -0700 |
| commit | 4ba7635f4d3f199dbb082b45cfe7b49f7e243587 (patch) | |
| tree | 812fb87e17337a33d8da048145ca6406cb70dc84 | |
| parent | 276c0cecadbe763e98c5cfd18b3ad32822964789 (diff) | |
glusterd: send the duplicate brick info to the cli
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2803 ([glusterfs-3.2.0qa14]: volume create succeeds even though there is a volume with an export directory in the path of current volume)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2803
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 10 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index bf601efcda5..df7a5f9fc91 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -1001,9 +1001,8 @@ glusterd_handle_create_volume (rpcsvc_request_t *req) if (!ret) { ret = -1; snprintf (err_str, sizeof (err_str), "Brick: %s:%s, %s" - " in the arguments mean the same", - tmpbrkinfo->hostname, tmpbrkinfo->path, - brick); + " one of the arguments contain the other", + tmpbrkinfo->hostname, tmpbrkinfo->path, brick); goto out; } list_add_tail (&brickinfo->brick_list, &tmpvolinfo.bricks); @@ -1423,9 +1422,8 @@ brick_val: if (!ret) { ret = -1; snprintf (err_str, sizeof (err_str), "Brick: %s:%s, %s" - " in the arguments mean the same", - tmpbrkinfo->hostname, tmpbrkinfo->path, - brick); + " one of the arguments contain the other", + tmpbrkinfo->hostname, tmpbrkinfo->path, brick); goto out; } list_add_tail (&brickinfo->brick_list, &tmpvolinfo.bricks); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index ec3449de4e0..c1c9481e194 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -739,6 +739,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path, "given path %s lies" " within %s", path, brickiter->path); + *brickinfo = brickiter; break; } } else @@ -748,6 +749,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path, " %s", brickiter->path, path); ret = 0; + *brickinfo = brickiter; break; } } |