Skip to contentSkip to conversation

block/replication.c: Fix crash issue after failover

PATCH RESEND In review Zhang Chen 2 participants 2 messages Jun 21, 2019 – Jun 26, 2019 Block layer

lore
Share & tools
lore

Zhang Chen

author
#0 lore raw

PATCH RESEND v2 1/1 block/replication.c: Fix crash issue after failover

From: Zhang Chen <[email protected]>

If we try to close replication after failover, it will crash here. So we need check the block job on active disk before cancel the job.

---
 block/replication.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
block/replication.c +3 -1
index b41bc507c0..a68bc7e986 100644
@@ -149,7 +149,9 @@ static void replication_close(BlockDriverState *bs)
         replication_stop(s->rs, false, NULL);
     }
     if (s->stage == BLOCK_REPLICATION_FAILOVER) {
-        job_cancel_sync(&s->commit_job->job);
+        if (s->commit_job) {
+            job_cancel_sync(&s->commit_job->job);
+        }
     }
 
     if (s->mode == REPLICATION_MODE_SECONDARY) {
Signature · 1 line
2.17.GIT
#1 lore raw
Quoted 16 lines · Zhang Chen

From: Zhang Chen <[email protected]>

If we try to close replication after failover, it will crash here. So we need check the block job on active disk before cancel the job.

---
 block/replication.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
block/replication.c +0 -0
index b41bc507c0..a68bc7e986 100644

block/replication.c static void replication_close(BlockDriverState *bs) · line 157

Quoted 10 lines
block/replication.c +3 -1
@@ -149,7 +149,9 @@ static void replication_close(BlockDriverState *bs)
         replication_stop(s->rs, false, NULL);
     }
     if (s->stage == BLOCK_REPLICATION_FAILOVER) {
-        job_cancel_sync(&s->commit_job->job);
+        if (s->commit_job) {
+            job_cancel_sync(&s->commit_job->job);
+        }
     }
 
     if (s->mode == REPLICATION_MODE_SECONDARY) {

I actually don't understand this right away.

The only place I see that sets commit_job is replication_stop, which sets it immediately after s->stage = BLOCK_REPLICATION_FAILOVER.

So if we're here in replication_close, shouldn't we have a valid job object?

...unless we never succeeded in launching this commit job, but then don't we have worse problems?

...Or, perhaps the job actually finished, but then we never cleared the job variable in replication_done, but then I don't see why this if statement would actually help us.

Can you share some details of the crash to help me understand the crash, and why this patch helps?

--js