[PULL,02/12] mirror: Keep s->synced on error

Commit Message

Vladimir Sementsov-Ogievskiy Sept. 21, 2021, 10:20 a.m. UTC

From: Hanna Reitz <[e-mail]>

An error does not take us out of the READY phase, which is what
s->synced signifies.  It does of course mean that source and target are
no longer in sync, but that is what s->actively_sync is for -- s->synced
never meant that source and target are in sync, only that they were at
some point (and at that point we transitioned into the READY phase).

The tangible problem is that we transition to READY once we are in sync
and s->synced is false.  By resetting s->synced here, we will transition
from READY to READY once the error is resolved (if the job keeps
running), and that transition is not allowed.

Signed-off-by: Hanna Reitz <[e-mail]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Reviewed-by: Kevin Wolf <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
---
 block/mirror.c | 1 -
 1 file changed, 1 deletion(-)

Patch

diff --git a/block/mirror.c b/block/mirror.c
index 85b781bc21..cad61496c2 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -121,7 +121,6 @@  typedef enum MirrorMethod {
 static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read,
                                             int error)
 {
-    s->synced = false;
     s->actively_synced = false;
     if (read) {
         return block_job_error_action(&s->common, s->on_source_error,