From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 2/6] migrate, flow: Abort migration on repair_flush() failure
Date: Mon, 3 Feb 2025 20:26:11 +1100 [thread overview]
Message-ID: <20250203092615.500163-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20250203092615.500163-1-david@gibson.dropbear.id.au>
If we're unable to set our sockets into repair mode, we won't be able to
complete our migration. However flow_migrate_source_pre() currently
ignores errors from repair_flush().
Propagate the error instead. Since we're not currently able to properly
roll back a partial migration setup this fails rather messily, but better
than carrying on as if nothing was wrong.
[This is a candidate to fold into the earlier patch]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/flow.c b/flow.c
index 8fcf8c44..ceb20183 100644
--- a/flow.c
+++ b/flow.c
@@ -898,7 +898,8 @@ int flow_migrate_source_pre(struct ctx *c, struct migrate_meta *m)
return rc; /* TODO: rollback */
}
- repair_flush(c); /* TODO: move to TCP logic */
+ if ((rc = repair_flush(c))) /* TODO: move to TCP logic */
+ return rc;
for (i = 0; i < FLOW_MAX; i++) { /* TODO: iterator with skip */
union flow *flow = &flowtab[i];
--
@@ -898,7 +898,8 @@ int flow_migrate_source_pre(struct ctx *c, struct migrate_meta *m)
return rc; /* TODO: rollback */
}
- repair_flush(c); /* TODO: move to TCP logic */
+ if ((rc = repair_flush(c))) /* TODO: move to TCP logic */
+ return rc;
for (i = 0; i < FLOW_MAX; i++) { /* TODO: iterator with skip */
union flow *flow = &flowtab[i];
--
2.48.1
next prev parent reply other threads:[~2025-02-03 9:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-03 9:26 [PATCH 0/6] More migration improvements David Gibson
2025-02-03 9:26 ` [PATCH 1/6] vhost-user: Change different vhost-user messages to trace() level David Gibson
2025-02-04 0:42 ` Stefano Brivio
2025-02-03 9:26 ` David Gibson [this message]
2025-02-03 9:26 ` [PATCH 3/6] migrate: Clearer debug message in migrate_request() David Gibson
2025-02-03 9:26 ` [PATCH 4/6] migrate: Handle sending header section from data sections David Gibson
2025-02-03 9:26 ` [PATCH 5/6] util: read_remainder should take const pointer to iovec David Gibson
2025-02-04 0:42 ` Stefano Brivio
2025-02-03 9:26 ` [PATCH 6/6] migrate: Make migration handlers simpler and more flexible David Gibson
2025-02-03 10:20 ` Stefano Brivio
2025-02-03 23:55 ` David Gibson
2025-02-04 0:12 ` Stefano Brivio
2025-02-04 3:36 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250203092615.500163-3-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).