J. Bruce Fields : > On Wed, Mar 02, 2011 at 02:27:22PM +0800, Mi Jinlong wrote: >> Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> >> --- >> nfs4.1/server41tests/st_exchange_id.py | 26 ++++++++++++++++++++++++++ >> 1 files changed, 26 insertions(+), 0 deletions(-) >> >> diff --git a/nfs4.1/server41tests/st_exchange_id.py b/nfs4.1/server41tests/st_exchange_id.py >> index b5e34e6..85f3092 100644 >> --- a/nfs4.1/server41tests/st_exchange_id.py >> +++ b/nfs4.1/server41tests/st_exchange_id.py >> @@ -1,5 +1,6 @@ >> from nfs4_const import * >> import nfs4_ops as op >> +import time >> from environment import check, fail >> from nfs4_type import * >> from rpc import RPCAcceptError, GARBAGE_ARGS, RPCTimeout >> @@ -436,3 +437,28 @@ def testNotOnlyOp(t, env): >> res = c.compound([op.exchange_id(owner, 0, protect, [c.impl_id]), op.putrootfh()]) >> # per draft 21 18.35.3, server MUST return NFS4ERR_NOT_ONLY_OP >> check(res, NFS4ERR_NOT_ONLY_OP) >> + >> +def testLeasePeriod(t, env): >> + """Any unconfirmed record that is not confirmed within >> + a lease period SHOULD be removed. >> + >> + FLAGS: exchange_id all >> + CODE: EID9 >> + """ >> + c1 = env.c1.new_client("%s_1" % env.testname(t)) >> + c2 = env.c1.new_client("%s_2" % env.testname(t)) >> + # CREATE_SESSION >> + chan_attrs = channel_attrs4(0,8192,8192,8192,128,8,[]) >> + time.sleep(80) > > Let's not hard-code any lease time. pynfs should do a getattr to find > the server's lease time, and use that as the basis for calculations > (we need something like the getLeaseTime in the 4.0 pynfs.) > > I actually usually set the server lease time to 15 seconds for testing, > just to make the tests go faster.... Agree with you! What about the following one? --- thanks, Mi Jinlong ================================= >From 3512a8141710190c92a4b836854f1df755b8e802 Mon Sep 17 00:00:00 2001 From: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> Date: Thu, 3 Mar 2011 19:58:22 +0800 Subject: [PATCH] CLNT: test lease period of unconfirmed record Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> --- nfs4.1/server41tests/st_exchange_id.py | 36 ++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/nfs4.1/server41tests/st_exchange_id.py b/nfs4.1/server41tests/st_exchange_id.py index b5e34e6..3986759 100644 --- a/nfs4.1/server41tests/st_exchange_id.py +++ b/nfs4.1/server41tests/st_exchange_id.py @@ -1,10 +1,15 @@ from nfs4_const import * import nfs4_ops as op +import time from environment import check, fail from nfs4_type import * from rpc import RPCAcceptError, GARBAGE_ARGS, RPCTimeout from nfs4lib import NFS4Error, hash_oids, encrypt_oids +def _getleasetime(sess): + res = sess.compound([op.putrootfh(), op.getattr(1 << FATTR4_LEASE_TIME)]) + return res.resarray[-1].obj_attributes[FATTR4_LEASE_TIME] + def testSupported(t, env): """Do a simple EXCHANGE_ID - no flags @@ -436,3 +441,34 @@ def testNotOnlyOp(t, env): res = c.compound([op.exchange_id(owner, 0, protect, [c.impl_id]), op.putrootfh()]) # per draft 21 18.35.3, server MUST return NFS4ERR_NOT_ONLY_OP check(res, NFS4ERR_NOT_ONLY_OP) + +def testLeasePeriod(t, env): + """Any unconfirmed record that is not confirmed within + a lease period SHOULD be removed. + + FLAGS: exchange_id all + CODE: EID9 + """ + c1 = env.c1.new_client("%s_1" % env.testname(t)) + c2 = env.c1.new_client("%s_2" % env.testname(t)) + + # Get server's lease time + c3 = env.c1.new_client("%s_3" % env.testname(t)) + sess = c3.create_session() + lease = _getleasetime(sess) + + # CREATE_SESSION + chan_attrs = channel_attrs4(0,8192,8192,8192,128,8,[]) + time.sleep(lease - 10) + # Inside lease period, create_session will success. + res1 = c1.c.compound([op.create_session(c1.clientid, c1.seqid, 0, + chan_attrs, chan_attrs, + 123, [])], None) + check(res1) + + time.sleep(lease + 10) + # After lease period, create_session will get error NFS4ERR_STALE_CLIENTID + res2 = c2.c.compound([op.create_session(c2.clientid, c2.seqid, 0, + chan_attrs, chan_attrs, + 123, [])], None) + check(res2, NFS4ERR_STALE_CLIENTID) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html