From nobody Mon Apr 29 18:05:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605302687; cv=none; d=zohomail.com; s=zohoarc; b=HkBpwFoJPHw8tGzw/g1vhXx/0UelrYhozOzigeN7NGcnKh3VHens9RGyL6EJVKD8VxlfLFRN5N8/ocI2pm+96uE25EcKc/WBQGfAIkhxAw/AaUHZrF/i4eQQvlMHX2j8J1wROoN918DE/jBHNc6QsEeP6Q4T/pk4gom0vsC29ZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605302687; h=Content-Type:Content-Transfer-Encoding:Cc: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=OjbYSUyEkl7ynwQOyHy83UdnMetYOmxrv+n5LDxoPJw=; b=mxl+0/nQ3KltZrFD8mQeNYYNcCT67wogh1pjHF/s73sCNJxdfp1q2MMOkAtF6YtJRIXXVI2DrBbc9ShDnjBCwknUDGUP/OLHpsbBPB0M6D9GzswXrUMGtAjjsRF2jw7O93POsJnUwm9aAULR5FpeBQ7TLk/Cm5u9XTDD3oxZ7x8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160530268749748.53476875233696; Fri, 13 Nov 2020 13:24:47 -0800 (PST) Received: from localhost ([::1]:40086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdgYo-0007CN-EK for importer@patchew.org; Fri, 13 Nov 2020 16:24:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdgRn-00024r-K6 for qemu-devel@nongnu.org; Fri, 13 Nov 2020 16:17:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdgRj-0005Qt-Ri for qemu-devel@nongnu.org; Fri, 13 Nov 2020 16:17:31 -0500 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-256-xfDyGr5HP4ehFJzb85BCiA-1; Fri, 13 Nov 2020 16:17:24 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7761480F041; Fri, 13 Nov 2020 21:17:23 +0000 (UTC) Received: from localhost (ovpn-114-96.ams2.redhat.com [10.36.114.96]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0FD42100164C; Fri, 13 Nov 2020 21:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605302246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OjbYSUyEkl7ynwQOyHy83UdnMetYOmxrv+n5LDxoPJw=; b=PkXwj7RRL87iJJPs4X9PnOtKxa4Qhiqfvv+z1MU4nh6PBZKlzH3FJYGinxx/ZPqWAPdLxU Xt1M9mFDCKw0XDZobcxRXVSNovrD+xThP/QkqP5DUzunEoubcijMzAQcR+rQoCRhMvHO98 uAWWE9eNz25EmeT7TWplHDJlRNyQEAU= X-MC-Unique: xfDyGr5HP4ehFJzb85BCiA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 1/3] quorum: Require WRITE perm with rewrite-corrupted Date: Fri, 13 Nov 2020 22:17:16 +0100 Message-Id: <20201113211718.261671-2-mreitz@redhat.com> In-Reply-To: <20201113211718.261671-1-mreitz@redhat.com> References: <20201113211718.261671-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Using rewrite-corrupted means quorum may issue writes to its children just from receiving read requests from its parents. Thus, it must take the WRITE permission when rewrite-corrupted is used. Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia --- block/quorum.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/quorum.c b/block/quorum.c index b70d365ba9..01e49e94a3 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1195,7 +1195,12 @@ static void quorum_child_perm(BlockDriverState *bs, = BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { + BDRVQuorumState *s =3D bs->opaque; + *nperm =3D perm & DEFAULT_PERM_PASSTHROUGH; + if (s->rewrite_corrupted) { + *nperm |=3D BLK_PERM_WRITE; + } =20 /* * We cannot share RESIZE or WRITE, as this would make the --=20 2.28.0 From nobody Mon Apr 29 18:05:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605302422; cv=none; d=zohomail.com; s=zohoarc; b=h/JKAOSmIoF2LvsqV7UN+j0vXyfXrgXyhVb0VMwR6IqUFnbiWIxLnqTjzEphTGfifg7SQq9uH0TO9oTbWGso0OrECbSmcV3gbFUSiiTiMurNob2IYCCKCcvYDYhLEGXZaANG17+2Oee7r3vSzswK1jCeCCz2k7qtEGkkTIRRZ1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605302422; h=Content-Type:Content-Transfer-Encoding:Cc: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=EUYG9Cu5BxcWBxH+/x5Lq6r4GhszHKnzFtV6Hc7Fw9A=; b=XPs7SNjTcnJbSIxegyw6nqO41I2hjFD2kfCxTV9kMUsG+mOIxBsB75JWedUUhMERfuCtvGWDH1Wz721Xd+w1ebdiZPPvKpYwQjrBDRWSBO5C4jbqqcD5pV2UIJ/8/qS/OB9SdVYaPtqU7EITVpOg4LAHpmq1C7h6KNXlqD+P/p4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605302422440559.9123107003821; Fri, 13 Nov 2020 13:20:22 -0800 (PST) Received: from localhost ([::1]:60226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdgUX-0003Yq-6Y for importer@patchew.org; Fri, 13 Nov 2020 16:20:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdgRn-00025J-SC for qemu-devel@nongnu.org; Fri, 13 Nov 2020 16:17:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdgRl-0005RR-6k for qemu-devel@nongnu.org; Fri, 13 Nov 2020 16:17:31 -0500 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-588-XsONqw-2PuWacUBnockaeA-1; Fri, 13 Nov 2020 16:17:26 -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 BD57B1006700; Fri, 13 Nov 2020 21:17:25 +0000 (UTC) Received: from localhost (ovpn-114-96.ams2.redhat.com [10.36.114.96]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 562D05B4A4; Fri, 13 Nov 2020 21:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605302248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EUYG9Cu5BxcWBxH+/x5Lq6r4GhszHKnzFtV6Hc7Fw9A=; b=MfUNDwNtrBGbYLDkUOjX4I8W9Wm4RpObQ2jGmeLPGfl3qZHiG6G32kKFIp5C/G3cpAuT/J uhWQ92AOnckjWRGkTT2juYReUzB1+0A5yyAumfFfrSRST87mOJiGxVIs14Zyr2TQZsZOiS tl3igcqCgsnxokY+IiUoTDFkEE5vZ1w= X-MC-Unique: XsONqw-2PuWacUBnockaeA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 2/3] iotests/081: Filter image format after testdir Date: Fri, 13 Nov 2020 22:17:17 +0100 Message-Id: <20201113211718.261671-3-mreitz@redhat.com> In-Reply-To: <20201113211718.261671-1-mreitz@redhat.com> References: <20201113211718.261671-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Otherwise, this breaks whenever the test directory contains the image format (e.g. "/tmp/test-raw-file" is filtered to "/tmp/test-IMGFMT-file" instead of "TEST_DIR"). Signed-off-by: Max Reitz --- tests/qemu-iotests/081 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index 537d40dfd5..253b7576be 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -45,15 +45,16 @@ _require_drivers quorum =20 do_run_qemu() { - echo Testing: "$@" | _filter_imgfmt + echo Testing: "$@" $QEMU -nographic -qmp stdio -serial none "$@" echo } =20 run_qemu() { - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\ - | _filter_qemu_io | _filter_generated_node_ids + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qem= u \ + | _filter_qmp | _filter_qemu_io \ + | _filter_generated_node_ids } =20 quorum=3D"driver=3Draw,file.driver=3Dquorum,file.vote-threshold=3D2" --=20 2.28.0 From nobody Mon Apr 29 18:05:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605302436; cv=none; d=zohomail.com; s=zohoarc; b=YXlltI4e8sAPEsV0D3+mCf57Ak9X++MsqkbMEOMeUk/BDqZUH9X1NKZDF5dLF3+HXBFWH1uYqrgkDqIOvUaas3HhzjJIcQtzA756PhlIWnKGkTl0Natx4Nurg31/NQVN0VeKgrR4KyEu2Ox9ZbpmrX2rVtJ3PlK4jpLuWzq9jKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605302436; h=Content-Type:Content-Transfer-Encoding:Cc: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=0BY9Kt2Se1GLO5uEflVDmlK8cvYfxG7lDxHk8+7I1jA=; b=GhdyHe6LsxNxqv6qUK3/+9Db+12DMDnvxo87B3Vu+tnEBNNhowwj0W5vkc/UNnlTqs6fw8jqegpKg08vEkK3MacH9fho6c4iaqLEY7i+gak78XusMi8pGd6uNXbt+9mW3sTkF/NLRqGf1aeevEB0fsnYSOi0q2g+BqWOahwdRF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605302436738749.5125612149244; Fri, 13 Nov 2020 13:20:36 -0800 (PST) Received: from localhost ([::1]:60718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdgUl-0003na-Ky for importer@patchew.org; Fri, 13 Nov 2020 16:20:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdgRp-00027h-Io for qemu-devel@nongnu.org; Fri, 13 Nov 2020 16:17:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdgRn-0005Rv-ES for qemu-devel@nongnu.org; Fri, 13 Nov 2020 16:17:33 -0500 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-551-FfabKXsDOM2TyQO0aKCb7Q-1; Fri, 13 Nov 2020 16:17:29 -0500 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 241EC57052; Fri, 13 Nov 2020 21:17:28 +0000 (UTC) Received: from localhost (ovpn-114-96.ams2.redhat.com [10.36.114.96]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B3B711C4; Fri, 13 Nov 2020 21:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605302250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0BY9Kt2Se1GLO5uEflVDmlK8cvYfxG7lDxHk8+7I1jA=; b=e35/OdrnK7VtEjVOxj+gJteQ2xsrEnujkVIIeyXwEjP0csDVgGr9k1VZp/LXUTB8QJD+lO VlmyEMmus0J1a2V/v0Q6kHazF1ocjHYWKbBc+i35c00MhHpTk82aKy1NUst4Hbr8Ccc31I GghCosfu5kJcsANPLMd/1b1iHjgjp4k= X-MC-Unique: FfabKXsDOM2TyQO0aKCb7Q-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 3/3] iotests/081: Test rewrite-corrupted without WRITE Date: Fri, 13 Nov 2020 22:17:18 +0100 Message-Id: <20201113211718.261671-4-mreitz@redhat.com> In-Reply-To: <20201113211718.261671-1-mreitz@redhat.com> References: <20201113211718.261671-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Test what happens when a rewrite-corrupted quorum node performs such a rewrite, while there is no parent that has taken the WRITE permission. Signed-off-by: Max Reitz --- tests/qemu-iotests/081 | 54 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/081.out | 27 +++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index 253b7576be..4e19972931 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -42,6 +42,7 @@ _supported_fmt raw _supported_proto file _supported_os Linux _require_drivers quorum +_require_devices virtio-scsi =20 do_run_qemu() { @@ -155,6 +156,59 @@ echo "=3D=3D checking that quorum has corrected the co= rrupted file =3D=3D" =20 $QEMU_IO -c "read -P 0x32 0 $size" "$TEST_DIR/2.raw" | _filter_qemu_io =20 +echo +echo "=3D=3D using quorum rewrite corrupted mode without WRITE permission = =3D=3D" + +# The same as above, but this time, do it on a quorum node whose only +# parent will not take the WRITE permission + +echo '-- corrupting --' +# Only corrupt a portion: The guest device (scsi-hd on virtio-scsi) +# will read some data (looking for a partition table to guess the +# disk's geometry), which would trigger a quorum mismatch if the +# beginning of the image was corrupted. The subsequent +# QUORUM_REPORT_BAD event would be suppressed (because at that point, +# there cannot have been a qmp_capabilities on the monitor). Because +# that event is rate-limited, the next QUORUM_REPORT_BAD that happens +# thanks to our qemu-io read (which should trigger a mismatch) would +# then be delayed past the VM quit and not appear in the output. +# So we keep the first 1M intact to see a QUORUM_REPORT_BAD resulting +# from the qemu-io invocation. +$QEMU_IO -c "write -P 0x42 1M 1M" "$TEST_DIR/2.raw" | _filter_qemu_io + +# Fix the corruption (on a read-only quorum node, i.e. without taking +# the WRITE permission on it -- its child nodes need to be R/W OTOH, +# so that rewrite-corrupted works) +echo +echo '-- running quorum --' +run_qemu \ + -blockdev file,node-name=3Dfile1,filename=3D"$TEST_DIR/1.raw" \ + -blockdev file,node-name=3Dfile2,filename=3D"$TEST_DIR/2.raw" \ + -blockdev file,node-name=3Dfile3,filename=3D"$TEST_DIR/3.raw" \ + -blockdev '{ + "driver": "quorum", + "node-name": "quorum", + "read-only": true, + "vote-threshold": 2, + "rewrite-corrupted": true, + "children": [ "file1", "file2", "file3" ] + }' \ + -device virtio-scsi,id=3Dscsi \ + -device scsi-hd,id=3Dquorum-drive,bus=3Dscsi.0,drive=3Dquorum \ + <