Re: [NFS] Has anyone run the Connectathon Testsuite recently?

[Trond Myklebust]

>>>>> " " == hjl  <H> writes:

     > I checked out kernel 2.4.9-6 from RedHat 7.1 updates. It failed
     > the Connectathon Testsuite against the Linux and none-Linux
     > server. I believe both NFS server and client are broken in
     > 2.4.9-6. See

     > http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=54868

     > Now the question is how bad the current Linus/AC kernels are?

They are not affected. The RedHat kernel seems to have the (known) bug
in which the grace period isn't reset. My fault for introducing it in
the 2.4.9-ac series...

I haven't gotten round to syncing up the AC kernel to the full reclaim
code that's in Linus' kernel, but Alan has already applied the
following patch (as of 2.4.10-ac12).

Cheers,
  Trond

--- linux-2.4.9-6/fs/lockd/svc.c.orig	Thu Oct 18 15:00:46 2001
+++ linux-2.4.9-6/fs/lockd/svc.c	Mon Oct 22 10:25:21 2001
@@ -122,6 +122,15 @@
 			if (nlmsvc_ops) {
 				nlmsvc_ops->detach();
 				grace_period_expire = nlmsvc_grace_period + jiffies;
+#ifdef RPC_DEBUG
+				nlmsvc_grace_period = 10 * HZ;
+#else
+				if (nlm_grace_period)
+					nlmsvc_grace_period = ((nlm_grace_period + nlm_timeout - 1)
+								/ nlm_timeout) * nlm_timeout * HZ;
+				else
+					nlmsvc_grace_period = 5 * nlm_timeout * HZ;
+#endif
 			}
 		}
 
@@ -133,8 +142,10 @@
 		 */
 		if (!grace_period_expire) {
 			timeout = nlmsvc_retry_blocked();
-		} else if (time_before(grace_period_expire, jiffies))
+		} else if (time_before(grace_period_expire, jiffies)) {
 			grace_period_expire = 0;
+			nlmsvc_grace_period = 0;
+		}
 
 		/*
 		 * Find a socket with data available and call its