From patchwork Thu Mar 14 21:12:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 10853667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77BD117E6 for ; Thu, 14 Mar 2019 21:12:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 649762A69B for ; Thu, 14 Mar 2019 21:12:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58F9F2A6BB; Thu, 14 Mar 2019 21:12:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 341D02A6FE for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727412AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33640 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727715AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 723A730EBB51; Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-122-19.rdu2.redhat.com [10.10.122.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A9C05D9C4; Thu, 14 Mar 2019 21:12:10 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 7FDD3213F7; Thu, 14 Mar 2019 17:12:10 -0400 (EDT) From: Scott Mayhew To: bfields@fieldses.org Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org Subject: [pynfs PATCH 1/4] nfs4.1: add some reboot tests Date: Thu, 14 Mar 2019 17:12:07 -0400 Message-Id: <20190314211210.7454-2-smayhew@redhat.com> In-Reply-To: <20190314211210.7454-1-smayhew@redhat.com> References: <20190314211210.7454-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP REBT2a, REBT2b, and REBT2c test recovery with multiple clients following a server reboot. Signed-off-by: Scott Mayhew --- nfs4.1/server41tests/st_reboot.py | 151 +++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/nfs4.1/server41tests/st_reboot.py b/nfs4.1/server41tests/st_reboot.py index b852ded..0216127 100644 --- a/nfs4.1/server41tests/st_reboot.py +++ b/nfs4.1/server41tests/st_reboot.py @@ -1,25 +1,33 @@ from xdrdef.nfs4_const import * from xdrdef.nfs4_type import * -from .environment import check, fail, create_file, open_file, create_confirm +from .environment import check, fail, create_file, open_file, create_confirm, close_file import sys import os -import nfs4lib +import time +import logging import nfs_ops op = nfs_ops.NFS4ops() from rpc import RPCTimeout # NOTE - reboot tests are NOT part of the standard test suite +log = logging.getLogger("test.env") + def _getleasetime(sess): res = sess.compound([op.putrootfh(), op.getattr(1 << FATTR4_LEASE_TIME)]) return res.resarray[-1].obj_attributes[FATTR4_LEASE_TIME] -def _waitForReboot(c, sess, env): +def _waitForReboot(env): env.serverhelper("reboot") # Wait until the server is back up. # The following blocks until it gets a response, # which happens when the server comes back up. env.c1.c1 = env.c1.connect(env.c1.server_address) + # Go ahead and whack the cached session and client ids now + # to avoid errors in Environment.finish(). + env.c1.sessions = {} + env.c1.clients = {} + return int(time.time()) def create_session(c, cred=None, flags=0): """Send a simple CREATE_SESSION""" @@ -51,7 +59,7 @@ def testRebootValid(t, env): reclaim_complete(sess) fh, stateid = create_confirm(sess, owner) sleeptime = 5 + _getleasetime(sess) - _waitForReboot(c, sess, env) + _waitForReboot(env) try: res = create_session(c) check(res, NFS4ERR_STALE_CLIENTID, "Reclaim using old clientid") @@ -67,3 +75,138 @@ def testRebootValid(t, env): reclaim_complete(sess) finally: env.sleep(sleeptime, "Waiting for grace period to end") + +class State(object): + def __init__(self, name, owner, c, sess, fh): + self.name = name + self.owner = owner + self.c = c + self.sess = sess + self.fh = fh + +def doTestOneClientGrace(t, env, state): + res = state.sess.compound([]) + check(res, NFS4ERR_BADSESSION, "Bare sequence after reboot") + res = create_session(state.c) + check(res, NFS4ERR_STALE_CLIENTID, "Reclaim using old clientid") + c = env.c1.new_client(state.name) + state.c = c + sess = c.create_session() + state.sess = sess + lease_time = _getleasetime(sess) + res = open_file(sess, state.owner, path=state.fh, + claim_type=CLAIM_PREVIOUS, + access=OPEN4_SHARE_ACCESS_BOTH, + deny=OPEN4_SHARE_DENY_NONE, + deleg_type=OPEN_DELEGATE_NONE) + check(res, msg="Reclaim using newly created clientid") + fh = res.resarray[-1].object + stateid = res.resarray[-2].stateid + reclaim_complete(sess) + close_file(sess, fh, stateid=stateid) + res = open_file(sess, state.owner, claim_type=CLAIM_NULL, + access=OPEN4_SHARE_ACCESS_BOTH, + deny=OPEN4_SHARE_DENY_NONE, + deleg_type=OPEN_DELEGATE_NONE) + check(res, NFS4ERR_GRACE, "New open during grace") + return lease_time + +def doTestOneClientNoGrace(t, env, state): + res = open_file(state.sess, state.owner, claim_type=CLAIM_NULL, + access=OPEN4_SHARE_ACCESS_BOTH, + deny=OPEN4_SHARE_DENY_NONE, + deleg_type=OPEN_DELEGATE_NONE) + if (res.status == NFS4ERR_GRACE): + return res + check(res, msg="New open after all clients done reclaiming") + fh = res.resarray[-1].object + stateid = res.resarray[-2].stateid + close_file(state.sess, fh, stateid=stateid) + return res + +# The server may have lifted the grace period early, but it's not obligated. +# Keep looping until all the clients have done a normal open. If the server +# didn't lift the grace period early we don't want to fail the test, but we +# do want to log a message. +def doTestAllClientsNoGrace(t, env, states): + all_done = False + warn_grace = False + start_time = int(time.time()) + ok_time = 0 + while not all_done: + all_done = True + for state in states: + res = doTestOneClientNoGrace(t, env, state) + if res.status == NFS4ERR_GRACE: + warn_grace = True + all_done = False + elif not ok_time: + ok_time = int(time.time()) + if not all_done: + time.sleep(1) + if warn_grace: + lift_time = ok_time - start_time + log.warn("server took approximately %d seconds to lift grace " + "after all clients reclaimed" % lift_time) + +def doTestRebootWithNClients(t, env, n=10): + boot_time = int(time.time()) + lease_time = 90 + states = [] + block = env.c1.new_client_session("%s_block" % env.testname(t)) + for i in range(n): + name = "%s_client_%i" % (env.testname(t), i) + owner = "owner_%s" % name + c = env.c1.new_client(name) + sess = c.create_session() + reclaim_complete(sess) + fh, stateid = create_confirm(sess, owner) + states.append(State(name, owner, c, sess, fh)) + lease_time = _getleasetime(sess) + boot_time = _waitForReboot(env) + + try: + for i in range(n): + lease_time = doTestOneClientGrace(t, env, states[i]) + + # At this point, all clients should have recovered except for 'block'. + # Recover that one now. + block = env.c1.new_client_session("%s_block" % env.testname(t)) + + # The server may have lifted the grace period early. Test it. + doTestAllClientsNoGrace(t, env, states) + + # If the test went normally, then the grace period should have already + # ended. If we got some unexpected error, then wait a bit for the server + # to expire the clients so cleanup can proceed more smoothly. + except: + grace_end_time = boot_time + lease_time + 5 + now = int(time.time()) + if now < grace_end_time: + sleep_time = grace_end_time - now + env.sleep(sleep_time, "Waiting for grace period to end") + raise + +def testRebootWithManyClients(t, env): + """Reboot with many clients + + FLAGS: reboot + CODE: REBT2a + """ + return doTestRebootWithNClients(t, env) + +def testRebootWithManyManyClients(t, env): + """Reboot with many many clients + + FLAGS: reboot + CODE: REBT2b + """ + return doTestRebootWithNClients(t, env, 100) + +def testRebootWithManyManyManyClients(t, env): + """Reboot with many many many clients + + FLAGS: reboot + CODE: REBT2c + """ + return doTestRebootWithNClients(t, env, 1000) From patchwork Thu Mar 14 21:12:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 10853659 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 595BD17E6 for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 454442A69B for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 397362A77B; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB65C2A69B for ; Thu, 14 Mar 2019 21:12:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727760AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59552 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727467AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6176381DFC; Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-122-19.rdu2.redhat.com [10.10.122.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AB885C231; Thu, 14 Mar 2019 21:12:10 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 84395213FC; Thu, 14 Mar 2019 17:12:10 -0400 (EDT) From: Scott Mayhew To: bfields@fieldses.org Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org Subject: [pynfs PATCH 2/4] nfs4.1: add some more reboot tests Date: Thu, 14 Mar 2019 17:12:08 -0400 Message-Id: <20190314211210.7454-3-smayhew@redhat.com> In-Reply-To: <20190314211210.7454-1-smayhew@redhat.com> References: <20190314211210.7454-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP REBT3a, REBT3b, and REBT3c test recovery with multiple clients following a server reboot, where the server reboots again during the grace period while clients are still reclaiming. Signed-off-by: Scott Mayhew --- nfs4.1/server41tests/st_reboot.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/nfs4.1/server41tests/st_reboot.py b/nfs4.1/server41tests/st_reboot.py index 0216127..8bce9ec 100644 --- a/nfs4.1/server41tests/st_reboot.py +++ b/nfs4.1/server41tests/st_reboot.py @@ -149,7 +149,7 @@ def doTestAllClientsNoGrace(t, env, states): log.warn("server took approximately %d seconds to lift grace " "after all clients reclaimed" % lift_time) -def doTestRebootWithNClients(t, env, n=10): +def doTestRebootWithNClients(t, env, n=10, double_reboot=False): boot_time = int(time.time()) lease_time = 90 states = [] @@ -166,6 +166,11 @@ def doTestRebootWithNClients(t, env, n=10): boot_time = _waitForReboot(env) try: + if double_reboot: + for i in range(n/2): + lease_time = doTestOneClientGrace(t, env, states[i]) + boot_time = _waitForReboot(env) + for i in range(n): lease_time = doTestOneClientGrace(t, env, states[i]) @@ -210,3 +215,27 @@ def testRebootWithManyManyManyClients(t, env): CODE: REBT2c """ return doTestRebootWithNClients(t, env, 1000) + +def testDoubleRebootWithManyClients(t, env): + """Double reboot with many clients + + FLAGS: reboot + CODE: REBT3a + """ + return doTestRebootWithNClients(t, env, double_reboot=True) + +def testDoubleRebootWithManyManyClients(t, env): + """Double reboot with many many clients + + FLAGS: reboot + CODE: REBT3b + """ + return doTestRebootWithNClients(t, env, 100, True) + +def testDoubleRebootWithManyManyManyClients(t, env): + """Double reboot with many many many clients + + FLAGS: reboot + CODE: REBT3c + """ + return doTestRebootWithNClients(t, env, 1000, True) From patchwork Thu Mar 14 21:12:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 10853665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1B13B1874 for ; Thu, 14 Mar 2019 21:12:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06E6C2A6BB for ; Thu, 14 Mar 2019 21:12:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF2DA2A6C0; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8181F2A710 for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727715AbfCNVMM (ORCPT ); Thu, 14 Mar 2019 17:12:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59278 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727513AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F225821F3; Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-122-19.rdu2.redhat.com [10.10.122.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E8D75D6A6; Thu, 14 Mar 2019 21:12:10 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 88872213FD; Thu, 14 Mar 2019 17:12:10 -0400 (EDT) From: Scott Mayhew To: bfields@fieldses.org Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org Subject: [pynfs PATCH 3/4] nfs4.1: still more reboot tests Date: Thu, 14 Mar 2019 17:12:09 -0400 Message-Id: <20190314211210.7454-4-smayhew@redhat.com> In-Reply-To: <20190314211210.7454-1-smayhew@redhat.com> References: <20190314211210.7454-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP REBT4a, REBT4b, and REBT4c test recovery with multiple clients following a server reboot, where half of the clients attempt to reclaim twice. Signed-off-by: Scott Mayhew --- nfs4.1/server41tests/st_reboot.py | 78 ++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 17 deletions(-) diff --git a/nfs4.1/server41tests/st_reboot.py b/nfs4.1/server41tests/st_reboot.py index 8bce9ec..06913f8 100644 --- a/nfs4.1/server41tests/st_reboot.py +++ b/nfs4.1/server41tests/st_reboot.py @@ -38,10 +38,13 @@ def create_session(c, cred=None, flags=0): 123, sec)], cred) return res -def reclaim_complete(sess): +def reclaim_complete(sess, dup=False): rc_op = op.reclaim_complete(FALSE) res = sess.compound([rc_op]) - check(res, msg="reclaim_complete") + if not dup: + check(res, msg="reclaim_complete") + else: + check(res, NFS4ERR_COMPLETE_ALREADY, msg="Duplicate reclaim_complete") ##################################################### @@ -84,11 +87,12 @@ class State(object): self.sess = sess self.fh = fh -def doTestOneClientGrace(t, env, state): - res = state.sess.compound([]) - check(res, NFS4ERR_BADSESSION, "Bare sequence after reboot") - res = create_session(state.c) - check(res, NFS4ERR_STALE_CLIENTID, "Reclaim using old clientid") +def doTestOneClientGrace(t, env, state, dup=False): + if not dup: + res = state.sess.compound([]) + check(res, NFS4ERR_BADSESSION, "Bare sequence after reboot") + res = create_session(state.c) + check(res, NFS4ERR_STALE_CLIENTID, "Reclaim using old clientid") c = env.c1.new_client(state.name) state.c = c sess = c.create_session() @@ -99,11 +103,15 @@ def doTestOneClientGrace(t, env, state): access=OPEN4_SHARE_ACCESS_BOTH, deny=OPEN4_SHARE_DENY_NONE, deleg_type=OPEN_DELEGATE_NONE) - check(res, msg="Reclaim using newly created clientid") - fh = res.resarray[-1].object - stateid = res.resarray[-2].stateid - reclaim_complete(sess) - close_file(sess, fh, stateid=stateid) + if not dup: + check(res, msg="Reclaim using newly created clientid") + fh = res.resarray[-1].object + stateid = res.resarray[-2].stateid + else: + check(res, NFS4ERR_NO_GRACE, msg="Duplicate reclaim") + reclaim_complete(sess, dup) + if not dup: + close_file(sess, fh, stateid=stateid) res = open_file(sess, state.owner, claim_type=CLAIM_NULL, access=OPEN4_SHARE_ACCESS_BOTH, deny=OPEN4_SHARE_DENY_NONE, @@ -149,7 +157,11 @@ def doTestAllClientsNoGrace(t, env, states): log.warn("server took approximately %d seconds to lift grace " "after all clients reclaimed" % lift_time) -def doTestRebootWithNClients(t, env, n=10, double_reboot=False): +def doTestRebootWithNClients(t, env, n=10, double_reboot=False, + double_reclaim=False): + if double_reboot and double_reclaim: + raise RuntimeError("double_reboot and double_reclaim cannot both be true") + boot_time = int(time.time()) lease_time = 90 states = [] @@ -166,13 +178,21 @@ def doTestRebootWithNClients(t, env, n=10, double_reboot=False): boot_time = _waitForReboot(env) try: - if double_reboot: + if double_reboot or double_reclaim: for i in range(n/2): lease_time = doTestOneClientGrace(t, env, states[i]) - boot_time = _waitForReboot(env) - for i in range(n): - lease_time = doTestOneClientGrace(t, env, states[i]) + if double_reboot: + boot_time = _waitForReboot(env) + + if double_reclaim: + for i in range(n/2): + lease_time = doTestOneClientGrace(t, env, states[i], True) + for i in range(n/2, n): + lease_time = doTestOneClientGrace(t, env, states[i]) + else: + for i in range(n): + lease_time = doTestOneClientGrace(t, env, states[i]) # At this point, all clients should have recovered except for 'block'. # Recover that one now. @@ -239,3 +259,27 @@ def testDoubleRebootWithManyManyManyClients(t, env): CODE: REBT3c """ return doTestRebootWithNClients(t, env, 1000, True) + +def testRebootWithManyClientsDoubleReclaim(t, env): + """Reboot with many clients where half try to reclaim twice + + FLAGS: reboot + CODE: REBT4a + """ + return doTestRebootWithNClients(t, env, double_reclaim=True) + +def testRebootWithManyManyClientsDoubleReclaim(t, env): + """Reboot with many many clients where half try to reclaim twice + + FLAGS: reboot + CODE: REBT4b + """ + return doTestRebootWithNClients(t, env, 100, double_reclaim=True) + +def testRebootWithManyManyManyClientsDoubleReclaim(t, env): + """Reboot with many many many clients where half try to reclaim twice + + FLAGS: reboot + CODE: REBT4c + """ + return doTestRebootWithNClients(t, env, 1000, double_reclaim=True) From patchwork Thu Mar 14 21:12:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 10853661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AB6D41515 for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99F152A69B for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E6DB2A77B; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 138522A6C0 for ; Thu, 14 Mar 2019 21:12:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727309AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53558 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727412AbfCNVML (ORCPT ); Thu, 14 Mar 2019 17:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6128E307E04C; Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-122-19.rdu2.redhat.com [10.10.122.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EA3C60BE6; Thu, 14 Mar 2019 21:12:10 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 8CF63213FE; Thu, 14 Mar 2019 17:12:10 -0400 (EDT) From: Scott Mayhew To: bfields@fieldses.org Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org Subject: [pynfs PATCH 4/4] nfs4.1: test delayed reclaim following a server reboot Date: Thu, 14 Mar 2019 17:12:10 -0400 Message-Id: <20190314211210.7454-5-smayhew@redhat.com> In-Reply-To: <20190314211210.7454-1-smayhew@redhat.com> References: <20190314211210.7454-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 14 Mar 2019 21:12:11 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP REBT5 tests a server reboot where the client begins reclaim shortly before the end of the grace period. Signed-off-by: Scott Mayhew --- nfs4.1/server41tests/st_reboot.py | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/nfs4.1/server41tests/st_reboot.py b/nfs4.1/server41tests/st_reboot.py index 06913f8..b77e2cf 100644 --- a/nfs4.1/server41tests/st_reboot.py +++ b/nfs4.1/server41tests/st_reboot.py @@ -283,3 +283,59 @@ def testRebootWithManyManyManyClientsDoubleReclaim(t, env): CODE: REBT4c """ return doTestRebootWithNClients(t, env, 1000, double_reclaim=True) + +def testRebootWithLateReclaim(t, env): + """Reboot with client that starts reclaim near end of grace + + FLAGS: reboot + CODE: REBT5 + """ + boot_time = int(time.time()) + lease_time = 90 + fh = [] + stateid = [] + name = "%s_client" % env.testname(t) + owner = "owner_%s" % name + c = env.c1.new_client(name) + sess = c.create_session() + reclaim_complete(sess) + N = 42 + for i in range(N): + path = sess.c.homedir + ["%s_file_%i" % (owner, i)] + tmpfh, tmpstateid = create_confirm(sess, owner, path) + fh.append(tmpfh) + lease_time = _getleasetime(sess) + boot_time = _waitForReboot(env) + try: + sleep_time = lease_time - 5 + env.sleep(sleep_time, "Delaying start of reclaim") + res = sess.compound([]) + check(res, NFS4ERR_BADSESSION, "Bare sequence after reboot") + res = create_session(c) + check(res, NFS4ERR_STALE_CLIENTID, "Reclaim using old clientid") + c = env.c1.new_client(name) + sess = c.create_session() + lease_time = _getleasetime(sess) + # Reclaim open files, with a short delay between each open reclaim. + # This should put us at the end of the original grace period. The + # server might keep extending the grace period by 1 second (up to + # an additional lease period in total) as long as we keep reclaming. + for i in range(N): + res = open_file(sess, owner, path=fh[i], claim_type=CLAIM_PREVIOUS, + access=OPEN4_SHARE_ACCESS_BOTH, + deny=OPEN4_SHARE_DENY_NONE, + deleg_type=OPEN_DELEGATE_NONE) + check(res, msg="Reclaim using newly created clientid") + tmpstateid = res.resarray[-2].stateid + stateid.append(tmpstateid) + time.sleep(0.25) + reclaim_complete(sess) + for i in range(N): + close_file(sess, fh[i], stateid[i]) + except: + grace_end_time = boot_time + lease_time + 5 + now = int(time.time()) + if now < grace_end_time: + sleep_time = grace_end_time - now + env.sleep(sleep_time, "Waiting for grace period to end") + raise