tests/migration: Setup pre-listened cpr.sock to remove race-condition.
PATCH v3 1/2 tests/migration: Setup pre-listened cpr.sock to remove race-condition.
When the source VM attempts to connect to the destination VM's Unix domain socket (cpr.sock) during a cpr-transfer test, race conditions can occur if the socket file isn't ready. This can lead to connection failures when running tests.
This patch creates and listens on the socket in advance, and passes the pre-listened FD directly. This avoids timing issues and improves the reliability of CPR tests.
--- tests/qtest/migration/cpr-tests.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
tests/qtest/migration/cpr-tests.c +12 -2
@@ -60,13 +60,12 @@ static void test_mode_transfer_common(bool incoming_defer) g_autofree char *cpr_path = g_strdup_printf("%s/cpr.sock", tmpfs); g_autofree char *mig_path = g_strdup_printf("%s/migsocket", tmpfs); g_autofree char *uri = g_strdup_printf("unix:%s", mig_path); + g_autofree char *opts_target;const char *opts ="-machine aux-ram-share=on -nodefaults" ; g_autofree const char *cpr_channel = g_strdup_printf("cpr,addr.transport=socket,addr.type=unix,addr.path=%s" , cpr_path); - g_autofree char *opts_target = g_strdup_printf("-incoming %s %s", - cpr_channel, opts); g_autofree char *connect_channels = g_strdup_printf( "[ { 'channel-type': 'main',"
@@ -75,6 +74,17 @@ static void test_mode_transfer_common(bool incoming_defer)" 'path': '%s' } } ]" , mig_path); +/* +* Set up a UNIX domain socket for the CPR channel before +* launching the destination VM, to avoid timing issues +* during connection setup. +*/ +int cpr_sockfd =qtest_socket_server (cpr_path); +g_assert (cpr_sockfd >=0 ); + + opts_target =g_strdup_printf ("-incoming cpr,addr.transport=socket," +"addr.type=fd,addr.str=%s %s" , +g_strdup_printf ("%d" , cpr_sockfd), opts);MigrateCommon args = { .start.opts_source = opts, .start.opts_target = opts_target,
Signature · 1 line
2.49.0
PATCH v3 2/2 migration: Support fd-based socket address in cpr_transfer_input
Extend cpr_transfer_input to handle SOCKET_ADDRESS_TYPE_FD alongside SOCKET_ADDRESS_TYPE_UNIX. This change supports the use of pre-listened socket file descriptors for cpr migration channels.
This change is particularly useful in qtest environments, where the socket may be created externally and passed via fd.
--- migration/cpr-transfer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
migration/cpr-transfer.c +5 -2
@@ -46,7 +46,8 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp)MigrationAddress *addr = channel->addr;if (addr->transport ==MIGRATION_ADDRESS_TYPE_SOCKET && - addr->u.socket.type ==SOCKET_ADDRESS_TYPE_UNIX ) { + (addr->u.socket.type ==SOCKET_ADDRESS_TYPE_UNIX || + addr->u.socket.type ==SOCKET_ADDRESS_TYPE_FD )) {g_autoptr (QIOChannelSocket) sioc =NULL ;SocketAddress *saddr = &addr->u.socket;
@@ -60,7 +61,9 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) sioc =qio_net_listener_wait_client (listener); ioc =QIO_CHANNEL (sioc); -trace_cpr_transfer_input (addr->u.socket.u.q_unix.path); +trace_cpr_transfer_input ( + addr->u.socket.type ==SOCKET_ADDRESS_TYPE_UNIX ? + addr->u.socket.u.q_unix.path : addr->u.socket.u.fd.str);qio_channel_set_name (ioc,"cpr-in" );return qemu_file_new_input (ioc);
Signature · 1 line
2.49.0
Re: [PATCH v3 2/2] migration: Support fd-based socket address in cpr_transfer_input
Quoted 28 lines · Jaehoon Kim
Extend
cpr_transfer_inputto handleSOCKET_ADDRESS_TYPE_FDalongsideSOCKET_ADDRESS_TYPE_UNIX. This change supports the use of pre-listened socket file descriptors for cpr migration channels.This change is particularly useful in qtest environments, where the socket may be created externally and passed via fd.
Reviewed-by Jason J. Herne <[email protected]>Signed-off-by Jaehoon Kim <[email protected]>--- migration/cpr-transfer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)migration/cpr-transfer.c +2
-1@@ -46,7 +46,8 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp)MigrationAddress *addr = channel->addr;if (addr->transport ==MIGRATION_ADDRESS_TYPE_SOCKET && - addr->u.socket.type ==SOCKET_ADDRESS_TYPE_UNIX ) { + (addr->u.socket.type ==SOCKET_ADDRESS_TYPE_UNIX || + addr->u.socket.type ==SOCKET_ADDRESS_TYPE_FD )) {g_autoptr (QIOChannelSocket) sioc =NULL ;SocketAddress *saddr = &addr->u.socket;
migration/cpr-transfer.c QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) · line 68
Quoted 9 lines
migration/cpr-transfer.c +3
-1@@ -60,7 +61,9 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) sioc =qio_net_listener_wait_client (listener); ioc =QIO_CHANNEL (sioc); -trace_cpr_transfer_input (addr->u.socket.u.q_unix.path); +trace_cpr_transfer_input ( + addr->u.socket.type ==SOCKET_ADDRESS_TYPE_UNIX ? + addr->u.socket.u.q_unix.path : addr->u.socket.u.fd.str);qio_channel_set_name (ioc,"cpr-in" );return qemu_file_new_input (ioc);
Re: [PATCH v3 2/2] migration: Support fd-based socket address in cpr_transfer_input
Quoted 32 lines · Steven Sistare
Quoted 31 lines · Jaehoon Kim
Extend
cpr_transfer_inputto handleSOCKET_ADDRESS_TYPE_FDalongsideSOCKET_ADDRESS_TYPE_UNIX. This change supports the use of pre-listened socket file descriptors for cpr migration channels.This change is particularly useful in qtest environments, where the socket may be created externally and passed via fd.
Reviewed-by Jason J. Herne <[email protected]>Signed-off-by Jaehoon Kim <[email protected]>---
migration/cpr-transfer.c| 7 +++++--1 file changed, 5 insertions(+), 2 deletions(-)migration/cpr-transfer.c +0
-0@@ -46,7 +46,8 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) MigrationAddress *addr = channel->addr;if (
addr->transport==MIGRATION_ADDRESS_TYPE_SOCKET&& -addr->u.socket.type==SOCKET_ADDRESS_TYPE_UNIX) { + (addr->u.socket.type==SOCKET_ADDRESS_TYPE_UNIX|| +addr->u.socket.type==SOCKET_ADDRESS_TYPE_FD)) {g_autoptr(QIOChannelSocket)sioc = NULL; SocketAddress *saddr =&addr->u.socket;migration/cpr-transfer.c +0
-1@@ -60,7 +61,9 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) sioc = qio_net_listener_wait_client(listener); ioc = QIO_CHANNEL(sioc); -trace_cpr_transfer_input (addr->u.socket.u.q_unix.path);
Quoted 9 lines
migration/cpr-transfer.c QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) · line 68
Quoted 5 lines
migration/cpr-transfer.c +3
-0+ trace_cpr_transfer_input( + addr->u.socket.type == SOCKET_ADDRESS_TYPE_UNIX ? + addr->u.socket.u.q_unix.path : addr->u.socket.u.fd.str); qio_channel_set_name(ioc, "cpr-in"); return qemu_file_new_input(ioc);Reviewed-by Steve Sistare <[email protected]>
Thank you for your review.
I have addressed your comment in patch 1 by using %d directly in g_strdup_printf, as suggested. Patch 2 remains unchanged, with only your Reviewed-by tag added.
I've just sent out v4 of the patch series. Please let me know if you have any further comments.
-- Jaehoon Kim
Jaehoon Kim <[email protected]> writes:
Hi,
These patches should be the other way around, first add the support, then add the test.
Quoted 39 lines
When the source VM attempts to connect to the destination VM's Unix domain socket (cpr.sock) during a cpr-transfer test, race conditions can occur if the socket file isn't ready. This can lead to connection failures when running tests.
This patch creates and listens on the socket in advance, and passes the pre-listened FD directly. This avoids timing issues and improves the reliability of CPR tests.
Reviewed-by Jason J. Herne <[email protected]>Signed-off-by Jaehoon Kim <[email protected]>--- tests/qtest/migration/cpr-tests.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)tests/qtest/migration/cpr-tests.c +2
-2@@ -60,13 +60,12 @@ static void test_mode_transfer_common(bool incoming_defer) g_autofree char *cpr_path = g_strdup_printf("%s/cpr.sock", tmpfs); g_autofree char *mig_path = g_strdup_printf("%s/migsocket", tmpfs); g_autofree char *uri = g_strdup_printf("unix:%s", mig_path); + g_autofree char *opts_target;const char *opts ="-machine aux-ram-share=on -nodefaults" ; g_autofree const char *cpr_channel = g_strdup_printf("cpr,addr.transport=socket,addr.type=unix,addr.path=%s" , cpr_path); - g_autofree char *opts_target = g_strdup_printf("-incoming %s %s", - cpr_channel, opts); g_autofree char *connect_channels = g_strdup_printf( "[ { 'channel-type': 'main',"@@ -75,6 +74,17 @@ static void test_mode_transfer_common(bool incoming_defer)" 'path': '%s' } } ]" , mig_path); +/*
tests/qtest/migration/cpr-tests.c static void test_mode_transfer_common(bool incoming_defer) · line 87
Quoted 10 lines
tests/qtest/migration/cpr-tests.c +10
-0+* Set up a UNIX domain socket for the CPR channel before +* launching the destination VM, to avoid timing issues +* during connection setup. +*/ +int cpr_sockfd =qtest_socket_server (cpr_path); +g_assert (cpr_sockfd >=0 ); + + opts_target =g_strdup_printf ("-incoming cpr,addr.transport=socket," +"addr.type=fd,addr.str=%s %s" , +g_strdup_printf ("%d" , cpr_sockfd), opts);
The sockfd string will leak.
Quoted 3 lines
tests/qtest/migration/cpr-tests.c +0
-0MigrateCommon args = { .start.opts_source = opts, .start.opts_target = opts_target,
Quoted 45 lines · Fabiano Rosas
Jaehoon Kim <[email protected]> writes:
Hi,
These patches should be the other way around, first add the support, then add the test.
Quoted 38 lines
When the source VM attempts to connect to the destination VM's Unix domain socket (cpr.sock) during a cpr-transfer test, race conditions can occur if the socket file isn't ready. This can lead to connection failures when running tests.
This patch creates and listens on the socket in advance, and passes the pre-listened FD directly. This avoids timing issues and improves the reliability of CPR tests.
Reviewed-by Jason J. Herne <[email protected]>Signed-off-by Jaehoon Kim <[email protected]>--- tests/qtest/migration/cpr-tests.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)tests/qtest/migration/cpr-tests.c +1
-2@@ -60,13 +60,12 @@ static void test_mode_transfer_common(bool incoming_defer) g_autofree char *cpr_path = g_strdup_printf("%s/cpr.sock", tmpfs); g_autofree char *mig_path = g_strdup_printf("%s/migsocket", tmpfs); g_autofree char *uri = g_strdup_printf("unix:%s", mig_path); + g_autofree char *opts_target;const char *opts ="-machine aux-ram-share=on -nodefaults" ; g_autofree const char *cpr_channel = g_strdup_printf("cpr,addr.transport=socket,addr.type=unix,addr.path=%s" , cpr_path); - g_autofree char *opts_target = g_strdup_printf("-incoming %s %s", - cpr_channel, opts); g_autofree char *connect_channels = g_strdup_printf( "[ { 'channel-type': 'main',"@@ -75,6 +74,17 @@ static void test_mode_transfer_common(bool incoming_defer)" 'path': '%s' } } ]" , mig_path);
Quoted 13 lines
tests/qtest/migration/cpr-tests.c static void test_mode_transfer_common(bool incoming_defer) · line 87
Quoted 11 lines
tests/qtest/migration/cpr-tests.c +11
-0+/* +* Set up a UNIX domain socket for the CPR channel before +* launching the destination VM, to avoid timing issues +* during connection setup. +*/ +int cpr_sockfd =qtest_socket_server (cpr_path); +g_assert (cpr_sockfd >=0 ); + + opts_target =g_strdup_printf ("-incoming cpr,addr.transport=socket," +"addr.type=fd,addr.str=%s %s" , +g_strdup_printf ("%d" , cpr_sockfd), opts);The sockfd string will leak.
Just use %d in the top-level printf:
opts_target = g_strdup_printf("-incoming cpr,addr.transport=socket,"
"addr.type=fd,addr.str=%d %s",
cpr_sockfd, opts);- Steve
Quoted 4 lines
Quoted 4 lines
tests/qtest/migration/cpr-tests.c +0
-0MigrateCommon args = { .start.opts_source = opts, .start.opts_target = opts_target,