andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

features/shard: Fix incorrect op_ret in READV

Browse Source 
Change-Id: I31ac99b290f82f4b74236c206193f7641c73d4dc
BUG: 1259651
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/12099
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
This commit is contained in:
Krutika Dhananjay 2015-09-03 15:47:01 +05:30 committed by Jeff Darcy
parent 092cc95ddc
commit fe7b37960b
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/bugs/shard/bug-1259651.t Normal file
View File

@ -0,0 +1,41 @@
#!/bin/bash
. $(dirname $0)/../../include.rc
cleanup
TEST glusterd
TEST pidof glusterd
TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
TEST $CLI volume start $V0
TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
TEST mkdir $M0/dir
TEST touch $M0/dir/file_plain
# Create "file_plain" with holes.
TEST truncate -s 12M $M0/dir/file_plain
# Perform writes on it that would create holes.
TEST dd if=/dev/zero of=$M0/dir/file_plain bs=1024 seek=10240 count=1024 conv=notrunc
md5sum_file_plain=$(md5sum $M0/dir/file_plain | awk '{print $1}')
# Now enable sharding on the volume.
TEST $CLI volume set $V0 features.shard on
TEST $CLI volume set $V0 performance.strict-write-ordering on
# Create a sharded file called "file_sharded"
TEST touch $M0/dir/file_sharded
# Truncate it to make it sparse
TEST truncate -s 12M $M0/dir/file_sharded
# Perform writes on it that would create holes in block-0 and block-1.
TEST dd if=/dev/zero of=$M0/dir/file_sharded bs=1024 seek=10240 count=1024 conv=notrunc
# If this bug is fixed, md5sum of file_sharded and file_plain should be same.
EXPECT "$md5sum_file_plain" echo `md5sum $M0/dir/file_sharded | awk '{print $1}'`
cleanup

10
xlators/features/shard/src/shard.c
View File

@ -2362,6 +2362,12 @@ shard_readv_do_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
local = frame->local;
/* If shard has already seen a failure here before, there is no point
* in aggregating subsequent reads, so just go to out.
*/
if (local->op_ret < 0)
goto out;
if (op_ret < 0) {
local->op_ret = op_ret;
local->op_errno = op_errno;
@ -2408,8 +2414,8 @@ out:
if (xdata)
local->xattr_rsp = dict_ref (xdata);
vec.iov_base = local->iobuf->ptr;
vec.iov_len = local->op_ret;
SHARD_STACK_UNWIND (readv, frame, local->op_ret,
vec.iov_len = local->total_size;
SHARD_STACK_UNWIND (readv, frame, local->total_size,
local->op_errno, &vec, 1,
&local->prebuf, local->iobref,
local->xattr_rsp);