From 4ec3c04a43b89fc76c8919aadfe28fb0b8990cd0 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Sat, 5 May 2012 16:50:18 +0530 Subject: mgmt/glusterd: allow volume start force Change-Id: If920bf0bf96b61b39bccbb10e66f5f39a55967f5 BUG: 812214 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.com/3279 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 2b89a69d6..0f77350c1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -4428,7 +4428,8 @@ check_xattr: /* This 'key' is set when the volume is started for the first time */ ret = sys_lgetxattr (path, "trusted.glusterfs.volume-id", old_uuid, 16); - if (ret >= 0) { + if ((ret >= 0 && ret != 16) || ((ret == 16) && + uuid_compare (old_uuid, uuid))) { snprintf (msg, sizeof (msg), "'%s:%s' has been part of " "a volume with id %s. Please re-create the brick " "directory.", host, path, uuid_utoa (old_uuid)); -- cgit