From 24d3099681c4fbeb4c9d868ee58810548335833a Mon Sep 17 00:00:00 2001 From: Richard Wareing Date: Fri, 25 Sep 2015 19:35:10 -0700 Subject: cluster/afr: Adjust gfid unsplit flow for proper correctness w/ AFR2 Summary: - Prior patch did not re-run the gfid-mismatch flow after doing the unsplit. I think this is prudent to re-validate the unsplit worked as well as allow the code to continue from where it effectively left off. Test Plan: - Run prove -v tests/basic/gfid_unsplit.t Reviewers: dph, moox, sshreyas Reviewed By: sshreyas Change-Id: Ib3ed40f3db38c89090a876d7af3a1b2a303539d5 Signed-off-by: Jeff Darcy Reviewed-on: https://review.gluster.org/17729 Smoke: Gluster Build System Tested-by: Jeff Darcy CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy --- tests/basic/gfid_unsplit.t | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/basic') diff --git a/tests/basic/gfid_unsplit.t b/tests/basic/gfid_unsplit.t index 9bb52f4533a..3fe7a6f140c 100644 --- a/tests/basic/gfid_unsplit.t +++ b/tests/basic/gfid_unsplit.t @@ -2,6 +2,7 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc +. $(dirname $0)/../nfs.rc cleanup; @@ -63,7 +64,8 @@ TEST [ "$MD5" == "$HEALED_MD5" ] TEST rm -f $M0/splitfile # Part II: NFS test -TEST mount -t nfs -o nolock,noatime,noacl,soft,intr $H0:/$V0 $N0; +TEST mount_nfs $H0:/$V0 $N0 nolock +#EST mount -t nfs -o nolock,noatime,noacl,soft,intr $H0:/$V0 $N0; dd if=/dev/urandom of=$N0/splitfile bs=128k count=5 2>/dev/null -- cgit