diff options
author | Kotresh HR <khiremat@redhat.com> | 2016-03-29 19:06:46 +0530 |
---|---|---|
committer | Venky Shankar <vshankar@redhat.com> | 2016-03-31 08:56:13 -0700 |
commit | 5560961e5188c6b8f4b09d57245513a8f9612ff4 (patch) | |
tree | fb52fe0d7c7502eff5d919ede131410c58db56ef /tests | |
parent | 3d34c495d547866a533bc0614b14163381830095 (diff) |
features/changelog: Don't modify 'pargfid' in 'resolve_pargfid_to_path'
Backport of http://review.gluster.org/#/c/13845/
If 'changelog' is enabled and 'changelog.capture-del-path' option is on
it calls 'resolve_pargfid_to_path' which modifies 'pargfid' sent by
caller. 'changelog_unlink' calls this routine directly with
'loc->pargfid' resulting it being modified and point to root instead of
actual pargfid. This is a nasty bug and could cause the deletion of
entry on root directory instead on actual parent when 'loc->path' is
not present. Hence this fix to make 'pargfid' a const pointer and
'resolve_pargfid' to work on copy of pargfid.
Glusterfind session creation enables these options by default to
capture deleted entry path in changelog.
Thanks Pranith for root causing this.
BUG: 1322552
Change-Id: I9f2bc44b5604b224462594c12b7d79e68198d693
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/13861
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bugs/changelog/bug-1321955.t | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/tests/bugs/changelog/bug-1321955.t b/tests/bugs/changelog/bug-1321955.t new file mode 100644 index 00000000000..9e3752b1728 --- /dev/null +++ b/tests/bugs/changelog/bug-1321955.t @@ -0,0 +1,60 @@ +#!/bin/bash + +#This file checks if missing entry self-heal and entry self-heal are working +#as expected. +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc +. $(dirname $0)/../../afr.rc + +cleanup; + +TEST glusterd +TEST pidof glusterd +TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} +TEST $CLI volume set $V0 changelog.changelog enable +TEST $CLI volume set $V0 changelog.capture-del-path on +TEST $CLI volume start $V0 + +#Mount the volume +TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 + +#Create files +TEST touch $M0/file1 +TEST mkdir $M0/dir1 +TEST touch $M0/dir1/file1 + +#Check for presence of files +TEST stat $B0/${V0}0/dir1/file1 +TEST stat $B0/${V0}1/dir1/file1 +TEST stat $B0/${V0}0/file1 +TEST stat $B0/${V0}1/file1 + +#Kill brick1 +TEST kill_brick $V0 $H0 $B0/${V0}1 + +#Del dir1/file1 +TEST rm -f $M0/dir1/file1 + +#file1 should be present in brick1 and not in brick0 +TEST ! stat $B0/${V0}0/dir1/file1 +TEST stat $B0/${V0}1/dir1/file1 + +#Bring up the brick which is down +TEST $CLI volume start $V0 force +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 + +#Initiate heal +TEST $CLI volume heal $V0 + +EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0 + +#dir1/file1 in brick1 should be deleted +TEST ! stat $B0/${V0}1/dir1/file1 + +#file1 under root should not be deleted in brick1 +TEST stat $B0/${V0}1/file1 + +cleanup; |