[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/7] commit: Fix is_read for block_job_error_action()
From: |
Kevin Wolf |
Subject: |
[PATCH 5/7] commit: Fix is_read for block_job_error_action() |
Date: |
Fri, 14 Feb 2020 21:08:10 +0100 |
block_job_error_action() needs to know if reading from the top node or
writing to the base node failed so that it can set the right 'operation'
in the BLOCK_JOB_ERROR QMP event.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/commit.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/commit.c b/block/commit.c
index 2992a1012f..8e672799af 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -143,6 +143,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp)
for (offset = 0; offset < len; offset += n) {
bool copy;
+ bool error_in_source = true;
/* Note that even when no rate limit is applied we need to yield
* with no pending I/O here so that bdrv_drain_all() returns.
@@ -162,11 +163,15 @@ static int coroutine_fn commit_run(Job *job, Error **errp)
ret = blk_co_pread(s->top, offset, n, buf, 0);
if (ret >= 0) {
ret = blk_co_pwrite(s->base, offset, n, buf, 0);
+ if (ret < 0) {
+ error_in_source = false;
+ }
}
}
if (ret < 0) {
BlockErrorAction action =
- block_job_error_action(&s->common, s->on_error, false, -ret);
+ block_job_error_action(&s->common, s->on_error,
+ error_in_source, -ret);
if (action == BLOCK_ERROR_ACTION_REPORT) {
goto out;
} else {
--
2.20.1
- [PATCH 0/7] commit: Expose on-error option in QMP, Kevin Wolf, 2020/02/14
- [PATCH 1/7] qapi: Document meaning of 'ignore' BlockdevOnError for jobs, Kevin Wolf, 2020/02/14
- [PATCH 2/7] commit: Remove unused bytes_written, Kevin Wolf, 2020/02/14
- [PATCH 4/7] commit: Inline commit_populate(), Kevin Wolf, 2020/02/14
- [PATCH 3/7] commit: Fix argument order for block_job_error_action(), Kevin Wolf, 2020/02/14
- [PATCH 5/7] commit: Fix is_read for block_job_error_action(),
Kevin Wolf <=
- [PATCH 6/7] commit: Expose on-error option in QMP, Kevin Wolf, 2020/02/14
- [PATCH 7/7] iotests: Test error handling policies with block-commit, Kevin Wolf, 2020/02/14