s3:blocking: demonstrate the posix lock retry fails

This is just a temporary commit that shows the bug and its
fix. It will be reverted once the problem is fixed.

The posix lock retry fails if the client specified timeout
is smaller than the hardcoded 1 second retry.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/selftest/knownfail.d/lock9 b/selftest/knownfail.d/lock9
new file mode 100644 (file)
index 0000000..0446225
--- /dev/null
+++ b/selftest/knownfail.d/lock9
@@ -0,0 +1 @@
+^samba3.smbtorture_s3.*.LOCK9B

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index cdc4613270e209690573802c206c618ecff8c6b8..91438fe44860d21f0d145fd3943021c454582e3f 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -236,7 +236,7 @@ struct tevent_req *smbd_smb1_do_locks_send(
 
                DBG_DEBUG("Blocked on a posix lock. Retry in one second\n");
 
-               tmp = timeval_current_ofs(1, 0);
+               tmp = timeval_current_ofs(15, 0);
                endtime = timeval_min(&endtime, &tmp);
        }
 
@@ -381,7 +381,7 @@ static void smbd_smb1_do_locks_retry(struct tevent_req *subreq)
 
                DBG_DEBUG("Blocked on a posix lock. Retry in one second\n");
 
-               tmp = timeval_current_ofs(1, 0);
+               tmp = timeval_current_ofs(15, 0);
                endtime = timeval_min(&endtime, &tmp);
        }