diff options
| author | Raghavendra Bhat <raghavendra@redhat.com> | 2014-07-17 12:15:54 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-09-18 11:02:31 -0700 |
| commit | 8f4c223c5f7a7a06c3b73dbb94e85d271bd84fb5 (patch) | |
| tree | ca13431725ccbf3f49b656b37c33169103aa01fe /tests | |
| parent | 82b24d64b9dc89672e6a298648f0e3959b62b1c0 (diff) | |
snapview-server: get the handle if its absent before doing any fop
* Now that NFS server does inode linking in readdirp, it can resolve the
gfid (i.e. find the right inode from its inode table) present in the
filehandle sent by the NFS client on which a fop came. So instead of
sending the lookup on that entry, it directly sends the fop. But
snapview-server does not get the handle for the entries in readdirp
(because doing a lookup on each entry via gfapi would be costly. So it
waits till a lookup is done on that inode, to get the handle and the
fs instance and fill it in the inode context). So when NFS resoves the
gfid and directly sends the fop, snapview-server will not be able to
perform the fop as the inode contet would not contain the fs instance
and the handle. So fops should check for the handle before doing gfapi
calls. If the handle and fs instance are not present in the inode context
they should get them by doing an explicit lookup on the entry.
rebase of the patch http://review.gluster.org/#/c/8324/
Change-Id: I70c9c8edb2e7ddad79cf6ade3e041b9d02241cd1
BUG: 1143961
Reviewed-on: http://review.gluster.org/8768
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/uss.t | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t index e59006d1cd8..0cd42ac177c 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -101,20 +101,31 @@ TEST fd_close $fd3 # test 44 TEST mount_nfs $H0:/$V0 $N0 nolock; -TEST ls -l $N0/.snaps; - NUM_SNAPS=$(ls $N0/.snaps | wc -l); TEST [ $NUM_SNAPS == 4 ]; +TEST stat $N0/.snaps/snap1; +TEST stat $N0/.snaps/snap2; + +TEST ls -l $N0/.snaps; + +# readdir + lookup on each entry TEST ls -l $N0/.snaps/snap1; TEST ls -l $N0/.snaps/snap2; -TEST ls -l $N0/.snaps/snap3; -TEST ls -l $N0/.snaps/snap4; + +# readdir + access each entry by doing stat. If snapview-server has not +# filled the fs instance and handle in the inode context of the entry as +# part of readdirp, then when stat comes (i.e fop comes directly without +# a previous lookup), snapview-server should do a lookup of the entry via +# gfapi call and fill in the fs instance + handle information in the inode +# context +TEST ls $N0/.snaps/snap3/; +TEST stat $N0/.snaps/snap3/dir1; +TEST stat $N0/.snaps/snap3/dir2; TEST ls -l $N0/.snaps/snap3/dir1; TEST ls -l $N0/.snaps/snap3/dir2; - TEST ls -l $N0/.snaps/snap4/dir1; TEST ls -l $N0/.snaps/snap4/dir2; @@ -123,6 +134,7 @@ TEST ! ls -l $N0/dir2/.snaps/snap2; TEST ls -l $N0/dir1/.snaps/snap3; TEST ls -l $N0/dir2/.snaps/snap4; + TEST fd1=`fd_available` TEST fd_open $fd1 'r' $N0/.snaps/snap1/file1; TEST fd_cat $fd1 |