[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 4/7] block-backend: Enable retry action on errors
From: |
Jiahui Cen |
Subject: |
[PATCH v4 4/7] block-backend: Enable retry action on errors |
Date: |
Tue, 15 Dec 2020 20:30:08 +0800 |
Enable retry action when backend's retry timer is available. It would
trigger the timer to do device specific retry action.
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Ying Fang <fangying1@huawei.com>
---
block/block-backend.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index bca7c581ee..9c6e50e568 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1803,6 +1803,9 @@ BlockErrorAction blk_get_error_action(BlockBackend *blk,
bool is_read,
return BLOCK_ERROR_ACTION_REPORT;
case BLOCKDEV_ON_ERROR_IGNORE:
return BLOCK_ERROR_ACTION_IGNORE;
+ case BLOCKDEV_ON_ERROR_RETRY:
+ return (blk->retry_timer) ?
+ BLOCK_ERROR_ACTION_RETRY : BLOCK_ERROR_ACTION_REPORT;
case BLOCKDEV_ON_ERROR_AUTO:
default:
abort();
@@ -1850,6 +1853,10 @@ void blk_error_action(BlockBackend *blk,
BlockErrorAction action,
qemu_system_vmstop_request_prepare();
send_qmp_error_event(blk, action, is_read, error);
qemu_system_vmstop_request(RUN_STATE_IO_ERROR);
+ } else if (action == BLOCK_ERROR_ACTION_RETRY) {
+ timer_mod(blk->retry_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) +
+ blk->retry_interval);
+ send_qmp_error_event(blk, action, is_read, error);
} else {
send_qmp_error_event(blk, action, is_read, error);
}
--
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 2/7] block-backend: Introduce retry timer, Jiahui Cen, 2020/12/15
- [PATCH v4 4/7] block-backend: Enable retry action on errors,
Jiahui Cen <=
- Re: [PATCH v4 0/7] block: Add retry for werror=/rerror= mechanism, Jiahui Cen, 2020/12/21