From 9c1d7cebbc62723f719b2fd0c45e0a7452e0d6be Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Thu, 4 Apr 2013 11:23:08 +0530 Subject: cluster/distribute: Ignore non-participating subvols for layout checks When subvols-per-directory is < available subvols, then there are layouts which are not populated. This leads to incorrect identification of holes or overlaps. We need to ignore layouts, which have err == 0, and start == stop. In the current scenario (start == stop == 0). Additionally, in layout-merge, treat missing xattrs as err = 0. In case of missing layouts, anomalies will reset them. For any other valid subvoles, err != 0 in case of layouts being zeroed out. Also reverted back dht_selfheal_dir_xattr, which does layout calculation only on subvols which have errors. Change-Id: I9f57062722c9e8a26285e10675c31a78921115a1 BUG: 921408 Signed-off-by: shishir gowda Reviewed-on: http://review.gluster.org/4668 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi Reviewed-by: Jeff Darcy --- tests/dht.rc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'tests/dht.rc') diff --git a/tests/dht.rc b/tests/dht.rc index ee92a47bd..663ea5431 100644 --- a/tests/dht.rc +++ b/tests/dht.rc @@ -2,13 +2,7 @@ function get_layout() { - layout=`getfattr -n trusted.glusterfs.dht -e hex $1 2>&1|grep dht |cut -d = -f2` - if [ $? -eq 1] - then - return -1 - else - return $layout - fi + getfattr -n trusted.glusterfs.dht -e hex $1 2>&1|grep dht |cut -d = -f2 } -- cgit