diff options
| author | Niels de Vos <ndevos@redhat.com> | 2013-03-20 18:48:12 +0100 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-03-22 13:33:58 -0700 |
| commit | e0e34d04aa68ac154818b55e7c337607fb141971 (patch) | |
| tree | 7e8f2f46fc2c49dfc7e5c083a24887944e1bbc0f | |
| parent | 1a5979dc09e15dbc83aada0b7647d2482e431884 (diff) | |
glusterd: Improve error logging when a brick from an old volume gets re-used
The error message when creating a volume that contains a brick with
certain xatts set on a parent directory is unclear.
Users do not understand '... or a prefix of it is already part of
a volume'. Most users check the final directory that is used for
a brick, but not its parents.
It would be helpful to present the user with the actual directory that
is preventing the volume to use the brick.
BUG: 923917
Change-Id: I815ad32a992eb0e41ee8fca6ee9327400d042c45
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/4701
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 09e3ff66940..e3099981f06 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5120,8 +5120,13 @@ out: } if (*in_use) { - snprintf (msg, sizeof (msg), "%s or a prefix of it is " - "already part of a volume", path); + if (!strcmp (path, curdir)) { + snprintf (msg, sizeof (msg), "%s is already part of a " + "volume", path); + } else { + snprintf (msg, sizeof (msg), "parent directory %s is " + "already part of a volume", curdir); + } } if (strlen (msg)) { |