[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 2/7] block-backend: Introduce retry timer
From: |
Jiahui Cen |
Subject: |
[PATCH v4 2/7] block-backend: Introduce retry timer |
Date: |
Tue, 15 Dec 2020 20:30:06 +0800 |
Add a timer to regularly trigger retry on errors.
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Ying Fang <fangying1@huawei.com>
---
block/block-backend.c | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index ce78d30794..fe775ea298 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -35,6 +35,9 @@
static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb);
+/* block backend default retry interval */
+#define BLOCK_BACKEND_DEFAULT_RETRY_INTERVAL 1000
+
typedef struct BlockBackendAioNotifier {
void (*attached_aio_context)(AioContext *new_context, void *opaque);
void (*detach_aio_context)(void *opaque);
@@ -95,6 +98,15 @@ struct BlockBackend {
* Accessed with atomic ops.
*/
unsigned int in_flight;
+
+ /* Timer for retry on errors. */
+ QEMUTimer *retry_timer;
+ /* Interval in ms to trigger next retry. */
+ int64_t retry_interval;
+ /* Start time of the first error. Used to check timeout. */
+ int64_t retry_start_time;
+ /* Retry timeout. 0 represents infinite retry. */
+ int64_t retry_timeout;
};
typedef struct BlockBackendAIOCB {
@@ -345,6 +357,11 @@ BlockBackend *blk_new(AioContext *ctx, uint64_t perm,
uint64_t shared_perm)
blk->on_read_error = BLOCKDEV_ON_ERROR_REPORT;
blk->on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;
+ blk->retry_timer = NULL;
+ blk->retry_interval = BLOCK_BACKEND_DEFAULT_RETRY_INTERVAL;
+ blk->retry_start_time = 0;
+ blk->retry_timeout = 0;
+
block_acct_init(&blk->stats);
qemu_co_queue_init(&blk->queued_requests);
@@ -456,6 +473,10 @@ static void blk_delete(BlockBackend *blk)
QTAILQ_REMOVE(&block_backends, blk, link);
drive_info_del(blk->legacy_dinfo);
block_acct_cleanup(&blk->stats);
+ if (blk->retry_timer) {
+ timer_del(blk->retry_timer);
+ timer_free(blk->retry_timer);
+ }
g_free(blk);
}
--
2.28.0
- [PATCH v4 0/7] block: Add retry for werror=/rerror= mechanism, Jiahui Cen, 2020/12/15
- [PATCH v4 1/7] qapi/block-core: Add retry option for error action, Jiahui Cen, 2020/12/15
- [PATCH v4 7/7] virtio_blk: Add support for retry on errors, Jiahui Cen, 2020/12/15
- [PATCH v4 3/7] block-backend: Add device specific retry callback, Jiahui Cen, 2020/12/15
- [PATCH v4 5/7] block-backend: Add timeout support for retry, Jiahui Cen, 2020/12/15
- [PATCH v4 6/7] block: Add error retry param setting, Jiahui Cen, 2020/12/15
- [PATCH v4 4/7] block-backend: Enable retry action on errors, Jiahui Cen, 2020/12/15
- [PATCH v4 2/7] block-backend: Introduce retry timer,
Jiahui Cen <=
- Re: [PATCH v4 0/7] block: Add retry for werror=/rerror= mechanism, Jiahui Cen, 2020/12/21