From: Greg Farnum Date: Mon, 19 Sep 2011 17:42:55 +0000 (-0700) Subject: locking: fix the horribly-botched maxwait values X-Git-Tag: v0.94.10~27^2^2~1005 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e498caaf86482ed74fc6122a4687c4c83ca6b1c7;p=ceph.git locking: fix the horribly-botched maxwait values And generally clean up the timing --- diff --git a/collections/multiclient/tasks/locking.yaml b/collections/multiclient/tasks/locking.yaml index 865b3b6b7be38..71966d53b16a1 100644 --- a/collections/multiclient/tasks/locking.yaml +++ b/collections/multiclient/tasks/locking.yaml @@ -1,10 +1,11 @@ +kernel: tasks: - ceph: - kclient: -- lockfile: [{client: client.0, lockfile: testfile, holdtime: 5, maxwait: 1}, - {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 11}, - {client: client.1, lockfile: testfile, holdtime: 0, maxwait: 0, expectfail: True}, - 10, - {client: client.0, lockfile: testfile, holdtime: 5, maxwait: 1}, - {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 1, expectfail: True}, - {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 11}] +- lockfile: [{client: client.0, lockfile: testfile, holdtime: 5, maxwait: 6}, + {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 12}, + {client: client.1, lockfile: testfile, holdtime: 0, maxwait: 3, expectfail: True}, + 20, + {client: client.0, lockfile: testfile, holdtime: 5, maxwait: 15}, + {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 3, expectfail: True}, + {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 15}]