From nobody Sun Feb 8 17:46:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1584457540; cv=none; d=zohomail.com; s=zohoarc; b=bjoXINY+XhysAgwYssnqufcX4X6+gBXLsuW32S43YogI7HH0DyZ+AnPoAHS3H8GPNCmVoRpN+LfJt1Oj4ON9JcowjIjIq/7OmvYvnf+2OP4q0sHRSiOD4y4zc97xBZUXRIF/yT2BgJyaHiWu2y0h9zSce8H9SiRiU7Ef4ViksWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584457540; 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=jXxcL7Wx6UyjPYcDjwsg/0kOBQ+3kCO4cs+eE00k3o4=; b=gXVR8F3W/31keLPqrg+zw0wdINFYdbhBi2rqTc6I1Ilh1FLdN+1JLr5ooJDGSOiKtcXaIWE479cpuF0ITDi0c6FalX31rsSGN8bbm1sVRNEb/I1gMe/IcPpqCBN/6xaT58LRz2ZRa1/pm8f7/SqND3A3KmqkIzALMiruJ6Vr/CY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1584457540322787.8962581555966; Tue, 17 Mar 2020 08:05:40 -0700 (PDT) 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-369-WGEZjUmgOfifB4Cg_VKBlg-1; Tue, 17 Mar 2020 11:05:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC8B18014D0; Tue, 17 Mar 2020 15:05:30 +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 966A56E3EE; Tue, 17 Mar 2020 15:05:30 +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 39DA118089D0; Tue, 17 Mar 2020 15:05:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02HF5NtV004567 for ; Tue, 17 Mar 2020 11:05:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id B8E095C1BB; Tue, 17 Mar 2020 15:05:23 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16B565C1D8 for ; Tue, 17 Mar 2020 15:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584457539; 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=jXxcL7Wx6UyjPYcDjwsg/0kOBQ+3kCO4cs+eE00k3o4=; b=O1nDX0aQeKQCvQGiAUwOCR3G+bra7y2s1kol4oAYS7ySBucRW5AwfaIPfc2TuiOj56XP/p bnbmO0jYinRqKTXbpKHU2N/WcAreQaIl2s6+w3U9mSdEyxSb7cxHVmmyV3zd/Y3CNnTPvu gv5VaORQMVSxcXOmmQpj/HsgSsoP29Q= X-MC-Unique: WGEZjUmgOfifB4Cg_VKBlg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] qemublocktest: Add tests for re-enabling of bitmaps after commit Date: Tue, 17 Mar 2020 16:05:15 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 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" Some branches were not covered and thus we didn't catch that the bitmaps are not re-enabled if nothing is merged into them. Two bitmaps are necessary to reliably test the case due to hash table ordering. Signed-off-by: Peter Krempa --- .../bitmap/snapshots-synthetic-broken.json | 18 ++++++++ .../bitmap/snapshots-synthetic-broken.out | 2 + .../snapshots-synthetic-broken-1-2 | 30 ++++++++++++ .../snapshots-synthetic-broken-1-3 | 46 +++++++++++++++++++ .../snapshots-synthetic-broken-1-4 | 46 +++++++++++++++++++ .../snapshots-synthetic-broken-1-5 | 46 +++++++++++++++++++ .../snapshots-synthetic-broken-2-3 | 46 +++++++++++++++++++ .../snapshots-synthetic-broken-2-4 | 46 +++++++++++++++++++ .../snapshots-synthetic-broken-2-5 | 46 +++++++++++++++++++ 9 files changed, 326 insertions(+) diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json= b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json index bf4963494f..8cf14d4baa 100644 --- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json +++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json @@ -398,6 +398,24 @@ "granularity": 65536, "count": 0 }, + { + "name": "oa", + "recording": true, + "persistent": true, + "busy": false, + "status": "active", + "granularity": 65536, + "count": 0 + }, + { + "name": "ob", + "recording": true, + "persistent": true, + "busy": false, + "status": "active", + "granularity": 65536, + "count": 0 + }, { "name": "d", "recording": true, diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out = b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out index 022630bd76..ad24a580f1 100644 --- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out +++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out @@ -3,6 +3,8 @@ libvirt-1-format: current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 libvirt-2-format: c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 + oa: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 + ob: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0 libvirt-3-format: a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-2 index d413fbe723..463120d442 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-2 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-2 @@ -1,4 +1,20 @@ pre job bitmap disable: +[ + { + "type": "block-dirty-bitmap-disable", + "data": { + "node": "libvirt-2-format", + "name": "oa" + } + }, + { + "type": "block-dirty-bitmap-disable", + "data": { + "node": "libvirt-2-format", + "name": "ob" + } + } +] merge bitmpas: [ { @@ -23,5 +39,19 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-enable", + "data": { + "node": "libvirt-2-format", + "name": "oa" + } + }, + { + "type": "block-dirty-bitmap-enable", + "data": { + "node": "libvirt-2-format", + "name": "ob" + } } ] diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-3 index 6eb14f927a..fec6f95dd1 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-3 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-3 @@ -62,5 +62,51 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-3-format", + "name": "oa", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-3-format", + "target": "oa", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "oa" + } + ] + } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-3-format", + "name": "ob", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-3-format", + "target": "ob", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "ob" + } + ] + } } ] diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-4 index f4d9b72576..697230f67b 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-4 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-4 @@ -69,5 +69,51 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-4-format", + "name": "oa", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-4-format", + "target": "oa", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "oa" + } + ] + } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-4-format", + "name": "ob", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-4-format", + "target": "ob", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "ob" + } + ] + } } ] diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-1-5 index a8e575c2d9..6bf1f0da64 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-5 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 1-5 @@ -69,5 +69,51 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-5-format", + "name": "oa", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-5-format", + "target": "oa", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "oa" + } + ] + } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-5-format", + "name": "ob", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-5-format", + "target": "ob", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "ob" + } + ] + } } ] diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-2-3 index d468e2b9d8..f202bb94b1 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 2-3 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 2-3 @@ -39,5 +39,51 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-3-format", + "name": "oa", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-3-format", + "target": "oa", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "oa" + } + ] + } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-3-format", + "name": "ob", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-3-format", + "target": "ob", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "ob" + } + ] + } } ] diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-2-4 index 2a9986bac6..864cc9041b 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 2-4 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 2-4 @@ -46,5 +46,51 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-4-format", + "name": "oa", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-4-format", + "target": "oa", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "oa" + } + ] + } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-4-format", + "name": "ob", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-4-format", + "target": "ob", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "ob" + } + ] + } } ] diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-= broken-2-5 index 47d9f6e17a..4c5d8dbe80 100644 --- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 2-5 +++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-= 2-5 @@ -46,5 +46,51 @@ merge bitmpas: } ] } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-5-format", + "name": "oa", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-5-format", + "target": "oa", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "oa" + } + ] + } + }, + { + "type": "block-dirty-bitmap-add", + "data": { + "node": "libvirt-5-format", + "name": "ob", + "persistent": true, + "disabled": false, + "granularity": 65536 + } + }, + { + "type": "block-dirty-bitmap-merge", + "data": { + "node": "libvirt-5-format", + "target": "ob", + "bitmaps": [ + { + "node": "libvirt-2-format", + "name": "ob" + } + ] + } } ] --=20 2.24.1