From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:43318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UwY-0005vt-H0 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:42:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UwX-0004QK-KS for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:42:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1UwX-0004OY-DT for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:42:37 -0500 From: "Dr. David Alan Gilbert (git)" Date: Wed, 6 Mar 2019 11:42:06 +0000 Message-Id: <20190306114227.9125-2-dgilbert@redhat.com> In-Reply-To: <20190306114227.9125-1-dgilbert@redhat.com> References: <20190306114227.9125-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/22] migration: Fix cancel state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, peterx@redhat.com, marcel.apfelbaum@gmail.com, wei.w.wang@intel.com, yury-kotov@yandex-team.ru, chen.zhang@intel.com Cc: eblake@redhat.com, armbru@redhat.com From: "Dr. David Alan Gilbert" During a cancelled migration there's a race where the fd can go into an error state before we get back around the migration loop and migration_detect_error transitions from cancelling->failed. Check for cancelled/cancelling and don't change the state. Red Hat bug: https://bugzilla.redhat.com/show_bug.cgi?id=3D1608649 Fixes: b23c2ade250 Signed-off-by: Dr. David Alan Gilbert Message-Id: <20190219195928.12289-1-dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu Reviewed-by: Juan Quintela --- migration/migration.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index c39d3054ec..e44f77af02 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2911,6 +2911,13 @@ static MigThrError postcopy_pause(MigrationState *= s) static MigThrError migration_detect_error(MigrationState *s) { int ret; + int state =3D s->state; + + if (state =3D=3D MIGRATION_STATUS_CANCELLING || + state =3D=3D MIGRATION_STATUS_CANCELLED) { + /* End the migration, but don't set the state to failed */ + return MIG_THR_ERR_FATAL; + } =20 /* Try to detect any file errors */ ret =3D qemu_file_get_error(s->to_dst_file); @@ -2920,7 +2927,7 @@ static MigThrError migration_detect_error(Migration= State *s) return MIG_THR_ERR_NONE; } =20 - if (s->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTIVE && ret =3D=3D -= EIO) { + if (state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTIVE && ret =3D=3D -EIO= ) { /* * For postcopy, we allow the network to be down for a * while. After that, it can be continued by a @@ -2932,7 +2939,7 @@ static MigThrError migration_detect_error(Migration= State *s) * For precopy (or postcopy with error outside IO), we fail * with no time. */ - migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); + migrate_set_state(&s->state, state, MIGRATION_STATUS_FAILED); trace_migration_thread_file_err(); =20 /* Time to stop the migration, now. */ --=20 2.20.1