diff options
| author | Prashanth Pai <ppai@redhat.com> | 2017-08-09 16:34:39 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2017-08-23 13:09:47 +0000 |
| commit | ee3d9ac7f2db3a4aa9186e08b5a1db62c3270188 (patch) | |
| tree | 70fce6f1aabcc57d465c427bd292e9936928a259 /tests | |
| parent | d165ffd7a5e19fa6d0c2f36be9b47280e3df8443 (diff) | |
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 <ppai@redhat.com>
Reviewed-on: https://review.gluster.org/18003
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/afr/resolve.t | 3 | ||||
| -rw-r--r-- | tests/bugs/replicate/bug-1130892.t | 3 | ||||
| -rw-r--r-- | tests/bugs/replicate/bug-1402730.t | 3 | ||||
| -rwxr-xr-x | tests/bugs/replicate/bug-830665.t | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/basic/afr/resolve.t b/tests/basic/afr/resolve.t index f7351f843ba..a741eee6e5e 100644 --- a/tests/basic/afr/resolve.t +++ b/tests/basic/afr/resolve.t @@ -24,9 +24,8 @@ TEST kill_brick $V0 $H0 $B0/${V0}0 rm -rf $B0/${V0}0/.glusterfs $B0/${V0}0/a #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 TEST $CLI volume start $V0 force EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_meta $M0 $V0-replicate-0 0 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 |