diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2018-06-26 15:58:02 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-07-02 17:14:07 +0000 |
| commit | 0894e1d3af83228fb02310e61c1dafea2dc56ef9 (patch) | |
| tree | c2571e5b61e9f81cc7ca0ae905dcb246989f57bb /tests/bugs | |
| parent | 8f6e437073ee20d8f1ec8efc57b9aac86d09269d (diff) | |
storage/posix: Fix posix_symlinks_match()
1) snprintf into linkname_expected should happen with PATH_MAX
2) comparison should happen with linkname_actual with complete
string linkname_expected
fixes bz#1595524
Change-Id: Ic3b3c362dc6c69c046b9a13e031989be47ecff14
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
(cherry picked from commit 3099d3e6ba81d3e1abf37385b13aabf5837b9c5e)
Diffstat (limited to 'tests/bugs')
| -rw-r--r-- | tests/bugs/replicate/bug-1477169-entry-selfheal-rename.t | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/bugs/replicate/bug-1477169-entry-selfheal-rename.t b/tests/bugs/replicate/bug-1477169-entry-selfheal-rename.t index 465800b19da..bb858a8a63d 100644 --- a/tests/bugs/replicate/bug-1477169-entry-selfheal-rename.t +++ b/tests/bugs/replicate/bug-1477169-entry-selfheal-rename.t @@ -13,10 +13,10 @@ 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 $V0 2 -TEST mkdir -p $M0/d1/dir $M0/d2 +TEST mkdir -p $M0/d1/dir012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 $M0/d2 gfid_d1=$(gf_get_gfid_xattr $B0/${V0}0/d1) gfid_d2=$(gf_get_gfid_xattr $B0/${V0}0/d2) -gfid_dir=$(gf_get_gfid_xattr $B0/${V0}0/d1/dir) +gfid_dir=$(gf_get_gfid_xattr $B0/${V0}0/d1/dir012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789) gfid_str_d1=$(gf_gfid_xattr_to_str $gfid_d1) gfid_str_d2=$(gf_gfid_xattr_to_str $gfid_d2) @@ -24,7 +24,7 @@ gfid_str_d3=$(gf_gfid_xattr_to_str $gfid_dir) # Kill 3rd brick and rename the dir from mount. TEST kill_brick $V0 $H0 $B0/${V0}2 -TEST mv $M0/d1/dir $M0/d2 +TEST mv $M0/d1/dir012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 $M0/d2 # Bring it back and trigger heal. TEST $CLI volume start $V0 force @@ -38,10 +38,15 @@ EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2 TEST $CLI volume heal $V0 EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 -# Check that .glusterfs symlink for dir exists and points to d2/dir +# Check that .glusterfs symlink for dir exists and points to d2/dir012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 TEST linkname=$(readlink $B0/${V0}2/.glusterfs/${gfid_str_d3:0:2}/${gfid_str_d3:2:2}/$gfid_str_d3) -EXPECT "dir" basename $linkname +EXPECT "dir012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" basename $linkname TEST parent_dir_gfid_str=$(echo $linkname|cut -d / -f5) EXPECT $gfid_str_d2 echo $parent_dir_gfid_str +TEST rmdir $M0/d2/dir012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +TEST ! stat $B0/${V0}0/.glusterfs/${gfid_str_d3:0:2}/${gfid_str_d3:2:2}/$gfid_str_d3 +TEST ! stat $B0/${V0}1/.glusterfs/${gfid_str_d3:0:2}/${gfid_str_d3:2:2}/$gfid_str_d3 +TEST ! stat $B0/${V0}2/.glusterfs/${gfid_str_d3:0:2}/${gfid_str_d3:2:2}/$gfid_str_d3 cleanup; |