]> git.proxmox.com Git - mirror_qemu.git/commit
blockjob: Adhere to rate limit even when reentered early
authorKevin Wolf <kwolf@redhat.com>
Wed, 10 May 2023 20:36:00 +0000 (22:36 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 19 May 2023 17:12:12 +0000 (19:12 +0200)
commit018e5987b57589e6e9089c2d2ef31db4e7519fd5
tree648465e9b4825e51bc1c712ce77453114a5cb096
parent01a10c243362e49afcb7acbd85a47eba64a6fc74
blockjob: Adhere to rate limit even when reentered early

When jobs are sleeping, for example to enforce a given rate limit, they
can be reentered early, in particular in order to get paused, to update
the rate limit or to get cancelled.

Before this patch, they behave in this case as if they had fully
completed their rate limiting delay. This means that requests are sped
up beyond their limit, violating the constraints that the user gave us.

Change the block jobs to sleep in a loop until the necessary delay is
completed, while still allowing cancelling them immediately as well
pausing (handled by the pause point in job_sleep_ns()) and updating the
rate limit.

This change is also motivated by iotests cases being prone to fail
because drain operations pause and unpause them so often that block jobs
complete earlier than they are supposed to. In particular, the next
commit would fail iotests 030 without this change.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230510203601.418015-8-kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/commit.c
block/mirror.c
block/stream.c
blockjob.c
include/block/blockjob_int.h