From ee3d9ac7f2db3a4aa9186e08b5a1db62c3270188 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Wed, 9 Aug 2017 16:34:39 +0530 Subject: glusterd: do not create .glusterfs/indices glusterd shouldn't concern itself with creating directories specific to certain xlators. The index xlator will now proceed creating './glusterfs/indices' dir only if the parent '.glusterfs' directory exists, which still fixes the original problem reported i.e 'volume start force' command shouldn't create brick path if it doesn't exist (BUG 1457202) This reverts most of the changes done by the commit b58a15948fb3fc37b6c0b70171482f50ed957f42 Change-Id: I7fc52ad64dce220e336c218fb4d85933ca2e61c0 Signed-off-by: Prashanth Pai Reviewed-on: https://review.gluster.org/18003 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Pranith Kumar Karampuri --- tests/bugs/replicate/bug-1130892.t | 3 +-- tests/bugs/replicate/bug-1402730.t | 3 +-- tests/bugs/replicate/bug-830665.t | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/bugs/replicate') diff --git a/tests/bugs/replicate/bug-1130892.t b/tests/bugs/replicate/bug-1130892.t index 9005791a597..c7988fd648b 100644 --- a/tests/bugs/replicate/bug-1130892.t +++ b/tests/bugs/replicate/bug-1130892.t @@ -40,9 +40,8 @@ TEST rm -rf $B0/${V0}-1/one TEST rm -rf $B0/${V0}-1/.glusterfs #Ideally, disk replacement is done using reset-brick or replace-brick gluster CLI -#which will create .glusterfs/indices folder. +#which will create .glusterfs folder. mkdir $B0/${V0}-1/.glusterfs && chmod 600 $B0/${V0}-1/.glusterfs -mkdir $B0/${V0}-1/.glusterfs/indices && chmod 600 $B0/${V0}-1/.glusterfs/indices # Start force TEST $CLI volume start $V0 force diff --git a/tests/bugs/replicate/bug-1402730.t b/tests/bugs/replicate/bug-1402730.t index 28c6761f91f..c7866df463b 100644 --- a/tests/bugs/replicate/bug-1402730.t +++ b/tests/bugs/replicate/bug-1402730.t @@ -24,9 +24,8 @@ rm -rf $B0/${V0}2/* rm -rf $B0/${V0}2/.glusterfs #Ideally, disk replacement is done using reset-brick or replace-brick gluster CLI -#which will create .glusterfs/indices folder. +#which will create .glusterfs folder. mkdir $B0/${V0}2/.glusterfs && chmod 600 $B0/${V0}2/.glusterfs -mkdir $B0/${V0}2/.glusterfs/indices && chmod 600 $B0/${V0}2/.glusterfs/indices TEST $CLI volume start $V0 force diff --git a/tests/bugs/replicate/bug-830665.t b/tests/bugs/replicate/bug-830665.t index d044dae75ea..acebe3ec917 100755 --- a/tests/bugs/replicate/bug-830665.t +++ b/tests/bugs/replicate/bug-830665.t @@ -77,9 +77,8 @@ volid=$(getfattr -e hex -n trusted.glusterfs.volume-id $B0/${V0}-0 2> /dev/null rm -rf $B0/${V0}-0; mkdir $B0/${V0}-0; #Ideally, disk replacement is done using reset-brick or replace-brick gluster CLI -#which will create .glusterfs/indices folder. +#which will create .glusterfs folder. mkdir $B0/${V0}-0/.glusterfs && chmod 600 $B0/${V0}-0/.glusterfs -mkdir $B0/${V0}-0/.glusterfs/indices && chmod 600 $B0/${V0}-0/.glusterfs/indices setfattr -n trusted.glusterfs.volume-id -v $volid $B0/${V0}-0 -- cgit