[Qemu-devel] [PATCH 1/2] migration: fix the Unknown ending state error log

[Qemu-devel] [PATCH 1/2] migration: fix the Unknown ending state error log

[Lidong Chen]

When cancelling migration, the state is MIGRATION_STATUS_CANCELLING.
The state change to MIGRATION_STATUS_CANCELLED when cleanup_bh is scheduled.
So when migration_iteration_finish is invoked, the state should be
MIGRATION_STATUS_CANCELLING.

Signed-off-by: Lidong Chen <lidongchen@tencent.com>
---
 migration/migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 8d56d56..ff05422 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2876,7 +2876,7 @@ static void migration_iteration_finish(MigrationState *s)
         s->vm_was_running = true;
         /* Fallthrough */
     case MIGRATION_STATUS_FAILED:
-    case MIGRATION_STATUS_CANCELLED:
+    case MIGRATION_STATUS_CANCELLING:
         if (s->vm_was_running) {
             vm_start();
         } else {
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/2] migration: fix duplicate initialization for expected_downtime and cleanup_bh

[Lidong Chen]

migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh.

Signed-off-by: Lidong Chen <lidongchen@tencent.com>
---
 migration/migration.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index ff05422..b8c4fec 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
     } else {
         /* This is a fresh new migration */
         rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO;
-        s->expected_downtime = s->parameters.downtime_limit;
-        s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
 
         /* Notify before starting migration thread */
         notifier_list_notify(&migration_state_notifiers, s);
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 2/2] migration: fix duplicate initialization for expected_downtime and cleanup_bh

[Peter Xu]

On Tue, Jul 24, 2018 at 08:16:25PM +0800, Lidong Chen wrote:
> migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh.
> 
> Signed-off-by: Lidong Chen <lidongchen@tencent.com>

This seems correct to me.

Reviewed-by: Peter Xu <peterx@redhat.com>

> ---
>  migration/migration.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index ff05422..b8c4fec 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
>      } else {
>          /* This is a fresh new migration */
>          rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO;
> -        s->expected_downtime = s->parameters.downtime_limit;
> -        s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
>  
>          /* Notify before starting migration thread */
>          notifier_list_notify(&migration_state_notifiers, s);
> -- 
> 1.8.3.1
> 
> 

Regards,

-- 
Peter Xu

Re: [Qemu-devel] [PATCH 2/2] migration: fix duplicate initialization for expected_downtime and cleanup_bh

[Juan Quintela]

Lidong Chen <jemmy858585@gmail.com> wrote:
> migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh.
>
> Signed-off-by: Lidong Chen <lidongchen@tencent.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Good catch.

Inserted here.

commit d3e35b8f6248eab2c3d412198a487ae49706b214
Author: Peter Xu <peterx@redhat.com>
Date:   Wed May 2 18:47:24 2018 +0800



> ---
>  migration/migration.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index ff05422..b8c4fec 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
>      } else {
>          /* This is a fresh new migration */
>          rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO;
> -        s->expected_downtime = s->parameters.downtime_limit;
> -        s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
>  
>          /* Notify before starting migration thread */
>          notifier_list_notify(&migration_state_notifiers, s);

Re: [Qemu-devel] [PATCH 2/2] migration: fix duplicate initialization for expected_downtime and cleanup_bh

[Dr. David Alan Gilbert]

* Lidong Chen (jemmy858585@gmail.com) wrote:
> migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh.

Queued (just 2/2)

> Signed-off-by: Lidong Chen <lidongchen@tencent.com>
> ---
>  migration/migration.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index ff05422..b8c4fec 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
>      } else {
>          /* This is a fresh new migration */
>          rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO;
> -        s->expected_downtime = s->parameters.downtime_limit;
> -        s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
>  
>          /* Notify before starting migration thread */
>          notifier_list_notify(&migration_state_notifiers, s);
> -- 
> 1.8.3.1
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [Qemu-devel] [PATCH 1/2] migration: fix the Unknown ending state error log

[Peter Xu]

On Tue, Jul 24, 2018 at 08:16:24PM +0800, Lidong Chen wrote:
> When cancelling migration, the state is MIGRATION_STATUS_CANCELLING.
> The state change to MIGRATION_STATUS_CANCELLED when cleanup_bh is scheduled.
> So when migration_iteration_finish is invoked, the state should be
> MIGRATION_STATUS_CANCELLING.
> 
> Signed-off-by: Lidong Chen <lidongchen@tencent.com>

Thanks, Lidong.  Dave just posted the same patch some days ago:

  [PATCH] migrate: Fix cancelling state warning

> ---
>  migration/migration.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 8d56d56..ff05422 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2876,7 +2876,7 @@ static void migration_iteration_finish(MigrationState *s)
>          s->vm_was_running = true;
>          /* Fallthrough */
>      case MIGRATION_STATUS_FAILED:
> -    case MIGRATION_STATUS_CANCELLED:
> +    case MIGRATION_STATUS_CANCELLING:
>          if (s->vm_was_running) {
>              vm_start();
>          } else {
> -- 
> 1.8.3.1
> 
> 

Regards,

-- 
Peter Xu