From nobody Thu Apr 25 01:49:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610364965; cv=none; d=zohomail.com; s=zohoarc; b=AQbk7FAhmcjVTx+YonPrtqmdob726JHuHpRlIG/aiYInOZyr6kU6sQ+YzNruwmEiI3CnxUXDkXGcODLxdqijy5fcZPyKWNlgamKA2SsnKCseNzKVF/HFb9pE3G1bobwc8k8bhCPGOmcHihlQY9er5zXyQmqxwodcm8VFi7V7Z4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610364965; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=esStyI6OE8gZkk0TbE6KU+ZHrJxJM1+MlcwQujG5FPg=; b=TAYxfaPV78rtgnMFo484x9ER4Ab/Y+ezNpW3U7sH9fqKtw90mQqnKkJW0P40rWxUw23zBQieNiQpdaM+tsemsGYCGM44DWImokhhE1MwEXNxVzE/UbXHt2GclylMxlFJmSeF/4wXY+TJ1f2Z5v8MASwuvYMkth3nZ+h+3lD2Tc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1610364965100603.764259650082; Mon, 11 Jan 2021 03:36:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-8YXPyht-PTGBEAmB0DEwEw-1; Mon, 11 Jan 2021 06:36:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7456107ACF8; Mon, 11 Jan 2021 11:35:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5713D1899A; Mon, 11 Jan 2021 11:35:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B3CF31809C9F; Mon, 11 Jan 2021 11:35:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10BBZqIL028480 for ; Mon, 11 Jan 2021 06:35:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9543677707; Mon, 11 Jan 2021 11:35:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E874476E3C for ; Mon, 11 Jan 2021 11:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610364964; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=esStyI6OE8gZkk0TbE6KU+ZHrJxJM1+MlcwQujG5FPg=; b=Sfmq5KMN5G65C6t1cLhsYZhbHb7qMX+Q1o/OiBgpekBqaWFMcrPhlxZT4jgs4urgR3+/wM FE7dCQKv4kxAwmaRdX9QG4OiM+PELoJZu+HfCFkD3/3GH0Yhb1iC3SnFFxZALEQL/HVafM r2B/acmSeNngVhWvTm+coOTGvgda4J0= X-MC-Unique: 8YXPyht-PTGBEAmB0DEwEw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/2] qemuMigrationSrcNBDStorageCopyReady: Use ready-state of mirror from qemuBlockJobData Date: Mon, 11 Jan 2021 12:35:45 +0100 Message-Id: <590af6b86940da4f2349fd6667b6111277685118.1610364893.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use the per-job state to determine when the non-shared-storage mirror is complete rather than the per-disk definition one. The qemuBlockJobData is a newer approach and is always cleared after the blockjob is terminated while the 'mirrorState' variable in the definition of the disk may be left over. In such case the disk mirror would be considered complete prematurely. https://bugzilla.redhat.com/show_bug.cgi?id=3D1889131 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c5108e55a0..5353c7ee01 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -591,10 +591,10 @@ qemuMigrationSrcNBDStorageCopyReady(virDomainObjPtr v= m, return -1; } - virObjectUnref(job); - - if (disk->mirrorState !=3D VIR_DOMAIN_DISK_MIRROR_STATE_READY) + if (job->state !=3D VIR_DOMAIN_BLOCK_JOB_READY) notReady++; + + virObjectUnref(job); } if (notReady) { --=20 2.29.2 From nobody Thu Apr 25 01:49:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610364972; cv=none; d=zohomail.com; s=zohoarc; b=hEX3bS+kugzHTwlRpr9F+bvVS7+4+emYprMbvzaMM8juAjBUn0tfTQzFQJlR+VBsovW9ncZg/9UuFbEmk/jmNzkoau56izg3G52/1YeprRghXa1/t3K6hzqGCT1CTLJXFxhub5dRsK5ldhEAFfUhLsUQOo71n1PzGGZOzYTLSjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610364972; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=89Q1CvhiFu+zVfOP1t4GCvYEOXuda2zaQhhKfKMkYaU=; b=n1VV7rBZTl50DGd1i/kNo963xo5SfN6+4M3ehEoDdSp+UxyitU5lFjf2u2CWyyc/yZ5IjLJQcS7kk87ZtcNCqTJT78nDiSu4Qpt7JLd6fxIL1wOyVESEBTq1uD8lti1t1Gvkl7wUxnSbWOkNyWNuAVdgjYT/fCZ2TufhY1DWCjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1610364972221843.8227766371417; Mon, 11 Jan 2021 03:36:12 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-6K3TFQQ_OyaTAHbbNwMN2A-1; Mon, 11 Jan 2021 06:36:08 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95894180A09B; Mon, 11 Jan 2021 11:36:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72DF75D9FC; Mon, 11 Jan 2021 11:36:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2B6974A7C6; Mon, 11 Jan 2021 11:36:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10BBZrLR028490 for ; Mon, 11 Jan 2021 06:35:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id A91C177707; Mon, 11 Jan 2021 11:35:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id F36B876E3C for ; Mon, 11 Jan 2021 11:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610364971; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=89Q1CvhiFu+zVfOP1t4GCvYEOXuda2zaQhhKfKMkYaU=; b=gxCiLNVXOfJAJCPFS/WXV7iD66S9VNzg/EB4zXHdymvpVn7wAVTr88DPSAVA2KS7L2iM0J rpYdGflcPdpss5k5C0d+TjIyHbE6oD1I6zbJB5yqKwkbS3JV+bJQzvHKxjm9mQC+zMjDul EWoxdxZG0wwPzRLWQ5eVkW1GDdHx00U= X-MC-Unique: 6K3TFQQ_OyaTAHbbNwMN2A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/2] qemuBlockJobEventProcess: Always clear 'mirrorState' when a job finishes Date: Mon, 11 Jan 2021 12:35:46 +0100 Message-Id: <80dcaf3ef0c1c282a2ee78bbd2b9974d455819a7.1610364893.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When a block job is terminated we should clear the 'mirrorState' and 'mirrorJob' variables so that stale values are not present prior to a new job. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_blockjob.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 2a5a5e66f4..0d00dbc947 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1691,6 +1691,10 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, case QEMU_BLOCKJOB_STATE_FAILED: case QEMU_BLOCKJOB_STATE_CANCELLED: case QEMU_BLOCKJOB_STATE_CONCLUDED: + if (job->disk) { + job->disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_NONE; + job->disk->mirrorJob =3D VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; + } qemuBlockJobEventProcessConcluded(job, driver, vm, asyncJob); break; --=20 2.29.2