From patchwork Mon Mar 28 08:59:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mi Jinlong X-Patchwork-Id: 667581 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2S8vu1p002875 for ; Mon, 28 Mar 2011 08:58:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752929Ab1C1I6X (ORCPT ); Mon, 28 Mar 2011 04:58:23 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:54713 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752005Ab1C1I6X (ORCPT ); Mon, 28 Mar 2011 04:58:23 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7FCDA170095; Mon, 28 Mar 2011 16:58:16 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p2S8q5di003074; Mon, 28 Mar 2011 16:52:05 +0800 Received: from [127.0.0.1] ([10.167.225.24]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011032816564654-125230 ; Mon, 28 Mar 2011 16:56:46 +0800 Message-ID: <4D904DF9.1080806@cn.fujitsu.com> Date: Mon, 28 Mar 2011 16:59:37 +0800 From: Mi Jinlong User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: "J. Bruce Fields" CC: NFS Subject: [PATCH v2 3/5] CLNT: test reclaim after RECLAIM_COMPLETE References: <4D6DE26C.3010103@cn.fujitsu.com> <4D904BEB.1060101@cn.fujitsu.com> In-Reply-To: <4D904BEB.1060101@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-28 16:56:46, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-28 16:56:47, Serialize complete at 2011-03-28 16:56:47 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 28 Mar 2011 08:58:26 +0000 (UTC) diff --git a/nfs4.1/server41tests/st_reclaim_complete.py b/nfs4.1/server41tests/st_reclaim_complete.py index 5e3174c..4c9fc37 100644 --- a/nfs4.1/server41tests/st_reclaim_complete.py +++ b/nfs4.1/server41tests/st_reclaim_complete.py @@ -1,9 +1,18 @@ from st_create_session import create_session from nfs4_const import * from environment import check, fail, use_obj, create_file +from nfs4_type import open_owner4, locker4, open_to_lock_owner4 import nfs4_ops as op import nfs4lib +def opt_result(res, opt=None): + """Get the corresponding result at res.resarray[]""" + if opt == None: + return + for resa in res.resarray: + if resa.resop == opt: + return resa + def testSupported(t, env): """Do a simple RECLAIM_COMPLETE @@ -20,3 +29,44 @@ def testSupported(t, env): res = sess.compound([op.reclaim_complete(FALSE)]) check(res) sess.destroy() + +def testReclaimAfterRECC(t, env): + """If client does subsequent reclaims of locking state after + RECLAIM_COMPLETE is done, server will return NFS4ERR_NO_GRACE. + rfc5661 18.51.3 + + FLAGS: reclaim_complete all + CODE: RECC2 + """ + name = env.testname(t) + c = env.c1.new_client(name) + sess = c.create_session() + + # RECLAIM_COMPLETE + res = sess.compound([op.reclaim_complete(FALSE)]) + check(res) + + fname = "owner_%s" % name + path = sess.c.homedir + [name] + res = create_file(sess, fname, path, access=OPEN4_SHARE_ACCESS_BOTH) + check(res) + + # Get stateid from OPEN4resok for making a lockowner + nres = opt_result(res, OP_OPEN) + if nres == None: + fail("Can not get OPEN4resok!") + oseqid = nres.stateid + + owner = open_owner4(0, "My Open Owner") + otlowner = open_to_lock_owner4(0, oseqid, 0, owner) + lowner = locker4(TRUE, otlowner) + + # Get filehandle from GETFHresok for locking + nres = opt_result(res, OP_GETFH) + if nres == None: + fail("Can not get GETFHresok!") + cfh = nres.object + + res = sess.compound([op.putfh(cfh), op.lock(READ_LT, TRUE, 0, 1, lowner)]) + check(res, NFS4ERR_NO_GRACE) + sess.destroy()