From e398f99d9ac7ca5c83004b814a4e8561916187f0 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Wed, 17 Dec 2014 10:41:05 +0100 Subject: telldir()/seekdir() portability fixes POSIX says that an offset obtained from telldir() can only be used on the same DIR *. Linux is abls to reuse the offset accross closedir()/opendir() for a given directory, but this is not portable and such a behavior should be fixed. An incomplete fix for the posix xlator was merged in http://review.gluster.com/8926 This change set completes it. - Perform the same fix index xlator. - Use appropriate casts and variable types so that 32 bit signed offsets obtained by telldir() do not get clobbered when copied into 64 bit signed types. - modify glfs-heal.c and afr-self-heald.c so that they do not use anonymous fd, since this will cause closedir()/opendir() between each syncop_readdir(). On failure we fallback to anonymous fs only for Linux so that we can cope with updated client vs not updated brick. - Avoid sending an EINVAL when the client request for the EOF offset. Here we fix an error in previous fix for posix xlator: since we fill each directory entry with the offset of the next entry, we must consider as EOF the offset of the last entry, and not the value of telldir() after we read it. - Add checks in regression tests that we do not hit cases where offsets fed to seekdir() are wrong. Introduce log_newer() shell function to check for messages produced by the current script. This fix gather changes from http://review.gluster.org/9047 and http://review.gluster.org/8936 making them obsolete. BUG: 1129939 Change-Id: I59fb7f06a872c4f98987105792d648141c258c6a Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/9071 Tested-by: Gluster Build System Reviewed-by: Raghavendra Bhat Tested-by: Raghavendra Bhat --- tests/basic/afr/self-heald.t | 4 ++++ tests/basic/pump.t | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'tests/basic') diff --git a/tests/basic/afr/self-heald.t b/tests/basic/afr/self-heald.t index 37e10b254c1..6937cf227d7 100644 --- a/tests/basic/afr/self-heald.t +++ b/tests/basic/afr/self-heald.t @@ -4,6 +4,7 @@ . $(dirname $0)/../../volume.rc cleanup; +START_TIMESTAMP=`date +%s` function disconnected_brick_count { local vol=$1 @@ -162,4 +163,7 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{6} TEST $CLI volume start $V0 TEST ! $CLI volume heal $V0 info +# Check for non Linux systems that we did not mess with directory offsets +TEST ! log_newer $START_TIMESTAMP "offset reused from another DIR" + cleanup diff --git a/tests/basic/pump.t b/tests/basic/pump.t index 6e81ddde6cd..e9e54a7a9ea 100644 --- a/tests/basic/pump.t +++ b/tests/basic/pump.t @@ -4,6 +4,7 @@ . $(dirname $0)/../volume.rc cleanup; +START_TIMESTAMP=`date +%s` TEST glusterd TEST pidof glusterd @@ -41,4 +42,7 @@ done EXPECT "" echo $files +# Check for non Linux systems that we did not mess with directory offsets +TEST ! log_newer $START_TIMESTAMP "offset reused from another DIR" + cleanup -- cgit