From e1f6ebc1a41d1759c2c4ec1d81a9b8a777b7a25d Mon Sep 17 00:00:00 2001 From: Rajesh Amaravathi Date: Wed, 23 Nov 2011 12:52:04 +0530 Subject: rebalance: remove the *.fix.layout xattr from trusted domain. moving trusted.distribute.fix.layout from trusted domain. Change-Id: If4317e4320998bbd739a8472b8814d75c425d341 BUG: 765487 Signed-off-by: Rajesh Amaravathi Reviewed-on: http://review.gluster.com/747 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/cluster/dht/src/dht-common.h | 2 +- xlators/mgmt/glusterd/src/glusterd-rebalance.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index c1b9364ba..791cf6335 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -29,7 +29,7 @@ #ifndef _DHT_H #define _DHT_H -#define GF_XATTR_FIX_LAYOUT_KEY "trusted.distribute.fix.layout" +#define GF_XATTR_FIX_LAYOUT_KEY "distribute.fix.layout" #define GF_DHT_LOOKUP_UNHASHED_ON 1 #define GF_DHT_LOOKUP_UNHASHED_AUTO 2 #define DHT_PATHINFO_HEADER "DISTRIBUTE:" diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 08865f38f..a7bac2450 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -235,7 +235,7 @@ gf_glusterd_rebalance_fix_layout (glusterd_volinfo_t *volinfo, const char *dir) if (S_ISDIR (stbuf.st_mode)) { /* Fix the layout of the directory */ /* TODO: isn't error code not important ? */ - sys_lsetxattr (full_path, "trusted.distribute.fix.layout", + sys_lsetxattr (full_path, "distribute.fix.layout", "yes", 3, 0); volinfo->defrag->total_files += 1; @@ -285,7 +285,7 @@ glusterd_defrag_start (void *data) } /* Fix the root ('/') first */ - sys_lsetxattr (defrag->mount, "trusted.distribute.fix.layout", + sys_lsetxattr (defrag->mount, "distribute.fix.layout", "yes", 3, 0); if ((defrag->cmd == GF_DEFRAG_CMD_START) || -- cgit