[Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_migration

[Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_migration

[Guang Wang]

From: Wang guang <wang.guang55@zte.com.cn>

The channel socket was initialized manually, 
but forgot to set QIO_CHANNEL_FEATURE_SHUTDOWN.
Thus, the colo_process_incoming_thread would hang at recvmsg.
This patch just call qio_channel_socket_new to get channel,
Which set QIO_CHANNEL_FEATURE_SHUTDOWN already.

Signed-off-by: Wang Guang<wang.guang55@zte.com.cn>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 io/channel-socket.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/io/channel-socket.c b/io/channel-socket.c
index f546c68..64b36f5 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -331,16 +331,10 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
 {
     QIOChannelSocket *cioc;
 
-    cioc = QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET));
-    cioc->fd = -1;
+    cioc = qio_channel_socket_new();
     cioc->remoteAddrLen = sizeof(ioc->remoteAddr);
     cioc->localAddrLen = sizeof(ioc->localAddr);
 
-#ifdef WIN32
-    QIO_CHANNEL(cioc)->event = CreateEvent(NULL, FALSE, FALSE, NULL);
-#endif
-
-
  retry:
     trace_qio_channel_socket_accept(ioc);
     cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_migration

[Hailiang Zhang]

Hi,

It seems that there is no difference from your previous version.
You don't have to re-send it if there are no changes.
This patch has been reviewed, so you can just wait until maintainers process it :)

Thanks.

On 2017/3/27 9:58, Guang Wang wrote:
> From: Wang guang <wang.guang55@zte.com.cn>
>
> The channel socket was initialized manually,
> but forgot to set QIO_CHANNEL_FEATURE_SHUTDOWN.
> Thus, the colo_process_incoming_thread would hang at recvmsg.
> This patch just call qio_channel_socket_new to get channel,
> Which set QIO_CHANNEL_FEATURE_SHUTDOWN already.
>
> Signed-off-by: Wang Guang<wang.guang55@zte.com.cn>
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>   io/channel-socket.c | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/io/channel-socket.c b/io/channel-socket.c
> index f546c68..64b36f5 100644
> --- a/io/channel-socket.c
> +++ b/io/channel-socket.c
> @@ -331,16 +331,10 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
>   {
>       QIOChannelSocket *cioc;
>   
> -    cioc = QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET));
> -    cioc->fd = -1;
> +    cioc = qio_channel_socket_new();
>       cioc->remoteAddrLen = sizeof(ioc->remoteAddr);
>       cioc->localAddrLen = sizeof(ioc->localAddr);
>   
> -#ifdef WIN32
> -    QIO_CHANNEL(cioc)->event = CreateEvent(NULL, FALSE, FALSE, NULL);
> -#endif
> -
> -
>    retry:
>       trace_qio_channel_socket_accept(ioc);
>       cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,

[Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_migration

[Guang Wang]

From: Wang guang <wang.guang55@zte.com.cn>

The channel socket was initialized manually, 
but forgot to set QIO_CHANNEL_FEATURE_SHUTDOWN.
Thus, the colo_process_incoming_thread would hang at recvmsg.
This patch just call qio_channel_socket_new to get channel,
Which set QIO_CHANNEL_FEATURE_SHUTDOWN already.

Signed-off-by: Wang Guang<wang.guang55@zte.com.cn>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 io/channel-socket.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/io/channel-socket.c b/io/channel-socket.c
index f546c68..64b36f5 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -331,16 +331,10 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
 {
     QIOChannelSocket *cioc;
 
-    cioc = QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET));
-    cioc->fd = -1;
+    cioc = qio_channel_socket_new();
     cioc->remoteAddrLen = sizeof(ioc->remoteAddr);
     cioc->localAddrLen = sizeof(ioc->localAddr);
 
-#ifdef WIN32
-    QIO_CHANNEL(cioc)->event = CreateEvent(NULL, FALSE, FALSE, NULL);
-#endif
-
-
  retry:
     trace_qio_channel_socket_accept(ioc);
     cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_migration

[Daniel P. Berrange]

On Fri, Mar 24, 2017 at 09:04:49AM +0800, Guang Wang wrote:
> From: Wang guang <wang.guang55@zte.com.cn>
> 
> The channel socket was initialized manually, 
> but forgot to set QIO_CHANNEL_FEATURE_SHUTDOWN.
> Thus, the colo_process_incoming_thread would hang at recvmsg.
> This patch just call qio_channel_socket_new to get channel,
> Which set QIO_CHANNEL_FEATURE_SHUTDOWN already.
> 
> Signed-off-by: Wang Guang<wang.guang55@zte.com.cn>
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>  io/channel-socket.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)

Looks good to me - I'll try to get this into 2.9


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://entangle-photo.org       -o-    http://search.cpan.org/~danberr/ :|