From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591471376; cv=none; d=zohomail.com; s=zohoarc; b=ksdmm8FZYGRGs3feIr0QOL59n13qdDTkO53Q+E/8MA/z2NQv60f/dJnxqCx9s5aWubumgCRMHVII4gFeLv2e3HVCEsOGUT4Ig3TLpRC0DXj/+lYLxY3vnMguLWQc71jJTbJ2ZMNxrDfWgVODGX717vdkTCofcNJ4shx7hV2xc4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591471376; h=Content-Type: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=ru+qdPYMyUk+Y+XIKcIHGR43I4QjR1kldqNTWm7japQ=; b=UWOupQ0Zyu0o+dZgnmxJH26DKSa1PlBkpsGhqydJ1ua0Tdmhh8hX3KlXF7Xr1SBZpnHV95X8tsjyrNxIXoD2SgCDy4l/4r/PD6a/ujLsgdgrs4V40fGy+LFchOyFU3cCC0SV21tjOZIjSBe1MX/8tDETlesTjw8CGsfQudOsVxI= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591471376488770.2510208056233; Sat, 6 Jun 2020 12:22:56 -0700 (PDT) Received: from localhost ([::1]:37718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheP9-0006lI-2X for importer@patchew.org; Sat, 06 Jun 2020 15:22:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheKu-0004Mi-Ta for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:32 -0400 Received: from mout.web.de ([212.227.15.3]:37187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheKo-0005aK-19 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:32 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0Lpyh5-1j4Cuc3RcF-00fgp5; Sat, 06 Jun 2020 21:17:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471074; bh=pEB8U8yNVa9GJCfnqrcey1P+mvKxuLB/fVnqTRIanMQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=YeVFkuTPJx6ohBJ8PDS7sMdL2aHf4A7+6JoWcGIfmDxcrXcDpqVYipaoxW7TtqY1h 695QHiuhdIT/AtcIFjmXvecEnb4s9gTZpKVJIXUrZ5IVbpqvHP1/GaV41IQTH3EXZc qfPISEQPRJ0byXKIXSeATdWOX39Wh70HdzYGvkLg= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:17:51 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 1/7] block/quorum.c: stable children names Message-ID: <6775a26cfe07bea3481ccf60ea7ce464d1b6c41d.1591456338.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/M8mPOhybZk08f6K0+cdPz2Y"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:x+Bhnza/LWN/meoyccth2M9MnpWy6xVZrIkpATAr5iPR4A2ccMH szK4pmZJf4qQP8wksxSLFrWc5YnAZThkFHTn6Id9vCNpr3RTgkLox1Yn6lODO5pBhY3Xlps JXl/iiDvGX5GabJghk5MHG2vUqEIgyLYjVfLy+vBN9RPIIRRkIeib3sPZBD17wtCSUe5va3 W0w3jrsGmaJ+KboN9RJVw== X-UI-Out-Filterresults: notjunk:1;V03:K0:uq+01L1sZdQ=:bFQsEj/u8Hom3WZHSJqWmm orWElE1+VFGrw3lfTvrCrsi1CukqFVbUTRkXkQn6vaWsWBO/ZPNXP2awuVaxt/kJykH0q6+pn 1h4tDYgRjBa7SjSbv481rzyw7Of/IkaIoEE2V3hFsDk5+rkYlhrhJhjC6sqg2EvaM0raES88j vbticb6cUreTAqCtiTUz6JtjOMDoo9gTQwlHqvTcyiN9D4JUmvVKnioMfzf3ax5wm2cKWVvf2 78mREKQbRVdQPUB/Lef60rXNyDW+KTfRGbKefVtQpWXGp9yHpaGOqypJvAB9c77eLaQ+iwbvD EmACK/bhu6s0HUam1xVLRx6tEpald7OjvkjcZ8rytkxrzUUO1K9il4VcMRL61reX//L0jyX5U UPTQFmB1bEkSA6ptpyKPsbOzySbY9fisaoSw9pq4Wdi64MNkRffzVIcLrIoTFtaHPHk0fw1pM 6LxY2+Ppg6mMIYsxV2peuVFL8YZi5nuj3e9mWHDg7uJHaCix+N05Hk5I0FgtsoOQqrbpEGzzE +zTS8GeLe9yNUljlnkxFvCTmOalPXBXM7sJOq1hySNaYhRiM2kSXQ7+ym2abHn+IfD1K7a8un R3PKRKRgRkgieKPpIOT7S5Y/8glru8FbSArRlkuphtBpJEez4t4LI60qjoFnwYBLjDO1YkF11 d7FvIWeermeqg7yQY3HIudRFlVjFVesFRv04cxo1VTaYH/cmjKd0I6cAD5EuP6Eth3DjmF43I T5APUe2qq6/KdGWujtm/HQHZbOzdEO8WVFyLl//0iviAqrAstdD30so1kz+jr8+lMLJ4u3QLY jzM+MvychTjWQRzTfC8pC3/WaEbZDkgJvqoRynGkt0oTrE2hiowp/377ABErfQqQILnef40lC 85EFp1DjmDHEnxt0U3ChEEjb0zcXXCd3rtr+wcb6tcTGwusmzlP3L6VkUKBHLKlDsoaVXt00/ LDHqEm6f3P8+CHYo2OF6vtDYudGbCNh0TkRpPpRpsFAqsf6zo5vyDJY4kPo6z9bUIxXbko1Yb TVQVu1mceWNyNySuQMb/m+jRrGkOsBmloZo8GJ8Mj1EXtGefXkO2Mbm1CE3PGV5X22kDLJWSP tJkoi8eZ1UBrdNHAiY37NC+g76PC+uHPrePRwwi2S7kF0Xcq5L3qW5L09woGFFo7xVDXg/11X NRP6yE+InvQr3UaICC8foigef6lOmPRnbNcMsPQRiBOzc0nlDlw/+7Hpt7/n5gB7pWq/j3yfN 5ksQSBU4pbzkB/2vj 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=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:17:41 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/M8mPOhybZk08f6K0+cdPz2Y Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If we remove the child with the highest index from the quorum, decrement s->next_child_index. This way we get stable children names as long as we only remove the last child. Signed-off-by: Lukas Straub Fixes: https://bugs.launchpad.net/bugs/1881231 Reviewed-by: Zhang Chen Reviewed-by: Alberto Garcia --- block/quorum.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index 6d7a56bd93..acfa09c2cc 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -29,6 +29,8 @@ #define HASH_LENGTH 32 +#define INDEXSTR_LEN 32 + #define QUORUM_OPT_VOTE_THRESHOLD "vote-threshold" #define QUORUM_OPT_BLKVERIFY "blkverify" #define QUORUM_OPT_REWRITE "rewrite-corrupted" @@ -972,9 +974,9 @@ static int quorum_open(BlockDriverState *bs, QDict *opt= ions, int flags, opened =3D g_new0(bool, s->num_children); for (i =3D 0; i < s->num_children; i++) { - char indexstr[32]; - ret =3D snprintf(indexstr, 32, "children.%d", i); - assert(ret < 32); + char indexstr[INDEXSTR_LEN]; + ret =3D snprintf(indexstr, INDEXSTR_LEN, "children.%d", i); + assert(ret < INDEXSTR_LEN); s->children[i] =3D bdrv_open_child(NULL, options, indexstr, bs, &child_format, false, &local_err); @@ -1026,7 +1028,7 @@ static void quorum_add_child(BlockDriverState *bs, Bl= ockDriverState *child_bs, { BDRVQuorumState *s =3D bs->opaque; BdrvChild *child; - char indexstr[32]; + char indexstr[INDEXSTR_LEN]; int ret; if (s->is_blkverify) { @@ -1041,8 +1043,8 @@ static void quorum_add_child(BlockDriverState *bs, Bl= ockDriverState *child_bs, return; } - ret =3D snprintf(indexstr, 32, "children.%u", s->next_child_index); - if (ret < 0 || ret >=3D 32) { + ret =3D snprintf(indexstr, INDEXSTR_LEN, "children.%u", s->next_child_= index); + if (ret < 0 || ret >=3D INDEXSTR_LEN) { error_setg(errp, "cannot generate child name"); return; } @@ -1069,6 +1071,7 @@ static void quorum_del_child(BlockDriverState *bs, Bd= rvChild *child, Error **errp) { BDRVQuorumState *s =3D bs->opaque; + char indexstr[INDEXSTR_LEN]; int i; for (i =3D 0; i < s->num_children; i++) { @@ -1090,6 +1093,11 @@ static void quorum_del_child(BlockDriverState *bs, B= drvChild *child, /* We know now that num_children > threshold, so blkverify must be fal= se */ assert(!s->is_blkverify); + snprintf(indexstr, INDEXSTR_LEN, "children.%u", s->next_child_index - = 1); + if (!strncmp(child->name, indexstr, INDEXSTR_LEN)) { + s->next_child_index--; + } + bdrv_drained_begin(bs); /* We can safely remove this child now */ -- 2.20.1 --Sig_/M8mPOhybZk08f6K0+cdPz2Y Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b698ACgkQNasLKJxd sljUIBAAm25oQ6tT5RXuR0padzEyjL99y5uBpFGTTwu+TpBLiJKXEaTcsUK0Pm8/ P1pWqk+0lArXb5Z30UC5yguy1xGjSkOJ2jre9q9dJSil0Xil0eWh8ZG9bgjOvSIk b9+VK4NRYtryo1JAbd8yKLwq23V9FvqoUkAmrjRJTJbMLbrCSyNrY3qR3jYd9YWb t6MbhnCAlA8qkt6uqGYhZWIKWfSXbshYdFxh/ayiIKQd3I20zknINOStDmDDa7Yb RHM7KX4WvCagjLrcQKCYtpz8K9nWhX8idhvhlRQQDC9iRFn1ZKxiOaaE7+81PCWh oAeCaBWWa7dHDNWd5GfMw+vx9+RI4WE5qM3ktB0ZJuxDlyXTPRLWly/+BuGUuJ5q Lze2EN+KLFhuF9+0m1RWseKw5trgVpjIy1f6muP/PXmckQD24uQoJnDQ9P8jtWoN a+Gjuf78irn1NELoaOT5QXFl9AdzTL3IUE36AAE8+zGNOYwOizW+8nf/MMl6kmJj AqUR52CKIvjRzaXbIgF6q2O4sRW2KFc6EcuqxZni8hYZHhXPdL2ViNHIVAbq63OW K08EXEhcYOHohPvk1nCaQlVFd8ZlKT9bqdBOZbXZeAnSYnPtGj6OsK1z6vXaCuMJ hbl3SbQ62dWOl9DPkSagwLYP4HxBpViDVTKQuxgg1Xb8Aze7edg= =3jkG -----END PGP SIGNATURE----- --Sig_/M8mPOhybZk08f6K0+cdPz2Y-- From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591471372; cv=none; d=zohomail.com; s=zohoarc; b=TKEbZsvezxSLGOfuX9bwXd8fE7SML+5Pt3/6TE1O5cmLIYHicKk0pB03oekWe+HdZ/PM2bzGQaJKntIpY4sklf34F92jpPXyVVKWpNUe/7oLtoHhsZ4q9KRiHI1ICVp47NmzZWyf2XiZKJsSmbD/KX6lIBmc6Cke6Ug0NdMm3Nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591471372; h=Content-Type: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=NF8YglkXcRYBBypoIDqBX6AWUhHf7/CUIAF0vYTkbMs=; b=EWqjxfn6Mr/FMoELZgxKEDh/ENzKoQqvKv7tFSL6B9/uV4CxRLOn53eMZWg1+pbub4Sq+H5x1tb4BTzRzvZGSCe5K0A71l9hqPsw0TjHn7kR/FNez5XzffgHZvVuHUMVpQJwHK7MggheVOzZu4e/fokY2H4vV47rAu8rlbA5Uqs= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591471372143110.10946670187377; Sat, 6 Jun 2020 12:22:52 -0700 (PDT) Received: from localhost ([::1]:37658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheP4-0006jq-Pw for importer@patchew.org; Sat, 06 Jun 2020 15:22:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheKy-0004VY-Sp for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:37 -0400 Received: from mout.web.de ([212.227.17.12]:40629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheKy-0005bY-0m for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:36 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Mg7I1-1jMQYF2ITN-00NQvU; Sat, 06 Jun 2020 21:17:58 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471078; bh=pt9EkwFNNdSEgpLYZHULMnvivuY+bmJWAt3j33lN1f4=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=eZ2v6eR/9uiUfkwXOhJkOs4fXeraBPUh8KJZW1pYbbsnlO2S8aki6u2pECTDVhKZC +zahAa9aZkDipPnYFIGmcjuZX7AAZY3cdfEouxoMQlUxUmk+0fYfR5ipmsZ8gmi3gw V3PCImcfDL2xX5EIMKh2S975l6V3IjDVlzP9lkgA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:17:57 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 2/7] avocado_qemu: Introduce pick_qemu_util to pick qemu utility binaries Message-ID: <3bf59de49c6d97d457e9955efe401335cf28930a.1591456338.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/UOdQJT+xMKOZy/ZGHlT3gE_"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:5v9ACSDUWM+V0dvUq18Xd/bgtoXuTBUBeOwhR5VnaSK1bapmP7i U0MVaxTplKQDDUSZQUEErbhuznjFFG83fPFLdODFsZ+TjRR5jJx6eS/4H4D2orEz02MBmri 4rziNL96p97ITuzAAjl+S27I3wBBmBk3HSbFNNE4+qJINukaJF5vNJKDpvRsJl1mLIfbl97 xpQDeYTTivyM4kBpl9Zww== X-UI-Out-Filterresults: notjunk:1;V03:K0:EVNUZvtHjJ4=:CUjtx16pwyq4UEU+6HLuVE UCZJYmG2Hpd+bhEOm1Fo4QaHq5x4ayaEt/iCtlD23pZbVMlRfCTVGa+ns9id/CGDoGqvEbNrp 3/+0d4/RVxXJNpAVi05lpKcGwXRTEbeCI3usoSsLlZpocH+v519hmgXH7ER2CrqSAtA9OA1To 6hdUuoEVJ7kec8k2wMBZn59wRO4BRDRcHmX7OS+FAckHFGfhkZMB8qnLT7KMhjc2bORAdwp7C 0ZzUpMcXFqa3MwzGW/p7lVDQTBbOL9zbRW450t8P53mxIOL1YdQzb7wepSqkBRvEFaBZnNzmq 0pCdq0G3+mk8ZEnX/C+rt7xwG5vdZbbR8837ck78ANYatWlXXdeXZUhnFq/cWK1i0sPUcq1+u 3pfrPBpkk5xu7wE9qi6oENlGGBS+YIF0dKgxPRECCBijLzT4IR1LrUEqEIqihteE+9f5/3w6U 4SEO2YFkE7lbw52t7Vd1ONVltYahljSsIyYqaYkxLW9NesqMtkBj+kWFDRgObZ+nxk8pDC1WV bcVuB/lxzgdnz1dafiNgsh7reXCqTJeA7vN2A5pfv21GM46Mitm3kgDwFu0zGn84FMi2iY+cp M1luwT/snv+PIasbMGWqM6DEBUw4mNS7xD4VqMB9/HPoZhcK7DNO8ybWijpcNNm2kOjkL/VPX 1SJdZ/qENaUCGO98xPt5+GA4Y0Fkc0ADmheDfkcofNs0MWR90/Bv9yr9PVunoyFhvs3O0JdyA MEUWjDxwF8MhZhgnMV4NdWyhTfexB+oa+7DpYdES+h4QpWGip59OuJ4OLg0efflRIEgjNeVwa /cCw7edl0zJ1XNr6qBcCn0ChddU5IKWcxNl4/glMVx4Svkgjp7zA6SkvKXc+mhooGlyN7CbEG rMeUT7H0duiTQvYXXnUJsAsksrtQ+NSoDMrULsgGieuV7LbP1NXgtcxvyM6XZodg5xF6Uu+v/ gIPvfY1OtGskxUlwuh0+szAvV6IA9U2NmdteeEZgwNj6wCw1QyHIwGDmZA6apsgk3+SmERbI7 63KV35h02PQc6PAqWFMkNHGOZ/jw/OOlGz+0hI3Ig4UNrXYZ3RFoTcxY85DKzDFrFKYnTK9gF t8P/Dg9+fg3NL9Y4rVwfVwogsydS1KJi4vjPxNr3vJ2zU7sNxUdhyvJQFhEkpVhIijnN6ZcFb alnJnN/EFpfYQYx+Cs8tFTuybxYq9YBp0f75GRnh5thHRCenHNshvX2kbrl28Lng9JHQhbsU/ ZY/DMae0CBlBrVJUv 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=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:18:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/UOdQJT+xMKOZy/ZGHlT3gE_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This introduces a generic function to pick qemu utility binaries from the build dir, system or via test parameter. Signed-off-by: Lukas Straub --- tests/acceptance/avocado_qemu/__init__.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 59e7b4f763..d0529dca6c 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -15,6 +15,7 @@ import uuid import tempfile import avocado +from avocado.utils.path import find_command #: The QEMU build root directory. It may also be the source directory #: if building from the source dir, but it's safer to use BUILD_DIR for @@ -144,6 +145,20 @@ def exec_command_and_wait_for_pattern(test, command, _console_interaction(test, success_message, failure_message, command += '\r') class Test(avocado.Test): + def pick_qemu_util(self, util): + default =3D os.path.join(BUILD_DIR, util) + if not os.path.exists(default): + default =3D find_command(default, False) + if not default: + default =3D None + + ret =3D self.params.get(util, default=3Ddefault) + + if ret is None: + self.cancel("Could not find \"%s\"" % util) + + return ret + def _get_unique_tag_val(self, tag_name): """ Gets a tag value, if unique for a key -- 2.20.1 --Sig_/UOdQJT+xMKOZy/ZGHlT3gE_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b6+UACgkQNasLKJxd slhifA//Wf3rog2ZIq9cL4AlOFMW/uc8kWSEhboFwjZqtOPJ5qBsj82PAC/oexJW 17THcdu4bFdO/GYsrqjfoWofg6ATSpwK8hBqIWaV0L7kFl5ARF+f05TgKGiW2rdh mgyh7twU6d6+jFF2RO6MR4WbDhgDlKrVQYiOg+7OVd7uBXjQ+AcOw13LshZ90L7J JuBgknMkVcf6D9qiBW2G7KsILAPUqw61qgFsaphv9ivCQYFWHmGAi3j6GBXWWi0T MmLJ5hqdP6pAMWdWB6DLSxzeevumKcKZSDIYSs5UkKiBLbPMdWxwWSPqe7tvMNkv ljhVFh4y7xn7fhCNtp1eRgHX9qmD8gE95bsGGPJ+1ka+uwVOESKXdb+Kzu8Kt9R4 SXCyFo9XtuuzIjNTpkEZEEnbfQg2LrqFSSTnJo3OcZnUCUyuVv7pxy1p3ZH828oe 91HCM9pH/FouF2f6/S9nY36XvsJA4wiQt2cFYvXsgLatVmE1YJWU3bvKuzQTNEN3 3Lgqc2gEnIKuU+8IAJf5UW2BkDAnOAyICVvbldL4S7Ndmfq2J6jPe9AhOljdta1U utpwq83oLVYkCZFQhU16hmG0t+AFVE39lbLw2DLuuSdwyOBzV7HtqTPMYze0ErsV K/oMfmc5+z7dtKivZoSVp/E2v7p6De2Gkaftj92IGt6AP5XXbgQ= =tims -----END PGP SIGNATURE----- --Sig_/UOdQJT+xMKOZy/ZGHlT3gE_-- From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591471697; cv=none; d=zohomail.com; s=zohoarc; b=j/PtZOq5GHRW578XWl+gik2tkOekeAXx5oF2oUSrd85WvMo54H3SvH65v7+9QJJBtRbWxghW1Mh1PGsFqvWFd8DMnQKCgKQetyzLT3u2HW8KC7zXqSHdyFxa5ThlmshfDOxUjWFfZPQdByOESbPvXDM+x/XrdW5pLjXL5Z8C3Dw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591471697; h=Content-Type: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=WX2TK65elDG+2NXkmFG2tj6uSfTL7WhwKRbNr+H0X6Y=; b=XFqbdzmAu9S0qq1G5A/mQPn25ec443PWMlVbSa065QWXmcBNqd/q/7CdNZaRfSQSX9qzfli+1wA90+H57V3pE/uloGrgI3scUSfvuImHk580vqhrCR0xQNkmgJr2WIXIIV+3kuSGzVGxO8eBLwyPx7B4Pz/wxD8ap31Tw1qVLqM= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591471697405875.5107723714692; Sat, 6 Jun 2020 12:28:17 -0700 (PDT) Received: from localhost ([::1]:49030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheUK-0003J7-1l for importer@patchew.org; Sat, 06 Jun 2020 15:28:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL0-0004XM-3k for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:38 -0400 Received: from mout.web.de ([212.227.15.4]:40259) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheKz-0005cA-6p for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:37 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M8zdd-1jp2Ar1TRt-00CUIX; Sat, 06 Jun 2020 21:18:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471084; bh=0U39OAVSTpeXgh0fl/DAwVKSc2A6a00gaGnzuby3zQE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=cckZBGoj/TPhylmdUTHMIv8L5vVjtoaH+1hTXiSiPmD3hrtO4qi4GqU1kT2iU1gRi mLcJix7+YFnQjfzeH1BvEuBN+VAQFRaFF71ICpDPE6JDS+qGB0jmftSqld6BMHCmdK MhzMjUJ2uqnQe2diQ2JhgDMyrqdaYM8n4fNR1SQQ= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:18:01 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 3/7] boot_linux.py: Use pick_qemu_util Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/e/=X.bfbwuHB/7/B5eifMbe"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:Hcx8Dy03YirD70VwsHUFc/BZGxy7gkqrfgT7gcNvaQxkckUt4sn kUevlGqfz0f26Um3nUQ82u2ogH9YSC7YsRYSUFehBosjlVIsQo+Wy/GCg2oCh3aAXS04cBv 9vkecVhvy++wbNUiFZInBw1c71K60Sn3PLFGXp3Bu4OTBFKDhY4Vpn5n2Klf8v3NUbBD5FV ZLsys/GEknHcFBMIUjpPg== X-UI-Out-Filterresults: notjunk:1;V03:K0:esxYdt/sE2A=:Tip+3Rhj6Uw7a7OvTSEy50 uQ4SxEXYT6jhB0+yLpIWeDbv4w5E4gWmEDDmPfhncq4UUCh4gAemevbYi8fGSeftAMnOH1mqN rMAmvVu8sL8P2Y8TNK8L3xxC8bWaAaYWPkvQoXUupLs1g3AZHjJ7iQXOUou81TGg20kSXhqtl RygF5pzKRj+uT/KIwqA9lJKzbsAA9RGCXY6HQSiNZ0EqWk0hnX441rHwRUnUKDTX7Ld6+uY/p wGS0BQdvuusm1oldOnSE3p3ECkZRM/rvjDrSC8eNNJ2rI88bGIbK67CnAptBkrlojN+Dgeuxs UntxwhgK+ezvVF3YbYh3GpYkZ9ytv7o7aXVHmopQ7Z42vn1kyZFYJseREzbJc5SzouMaG7b36 yda5DydGrn2jc8zkcMtrpVpsR9kT/BtsrU2WTUzUSJHrkP1Ta4m8jwJ2llumLkqx+vD/hNklr yclJ7W2H13pJ7LVW1lFI9A86LSjbnhLoUIE0Frer7+R8GZZsxKy9+8drCwDRyaU/61vxQTjUE JWsy8R4j98s7wL2bErPD8cTWUpXrYODMRTvF108jqlzHzU0mMi5RACxIZl2DobhIAVlfNkrIL y9s9nIu0dgtcK64yPXXRuFyYudrQxg9SJ75QRFfmdeDeuNmEGTvPZ+Au46xa3Z9Vi/FR4w5co npGmnSu1F9axg00qv5aaXHDnBQ8BAcp9ltmm+jpR2yjllUfmPK+DN2FUv5/01kfEOD58Y2Lhq Ze+yOQQm91JtMUpSrpiVrS1ECcamMySaFHpPsUSGUS41Zp3kT7+zt9j402szWIoR2goNpFIpt foRQuiVW7XPh1LCR5E3PM7QPidWXpusJkaF5/BulXIZnoT/djWvfS4I3Xt59QMFczvY0r9Pn9 wgZmmedJGFm0f6VkkshwBP6Tfj27kps3cjC6nBrDebz8wAtD2xcrsctq1CYsOMVGm9Jm0KyWV tcHXLzfQXwtZvI5cZanIJBcgtLnHlaNRUQ0CeQadSz/EJvcvh65agn7gAy36D54MW0tjDv21K X3aS+w1KHnjytJDDZVcl9ulBit8oPZigkrpq1jn1SAFv442U6ozTPJKWt2SqfZLfAaIYT7FZn RjMePmuBQqD7DeaCaRg40h8yrAdlUSk7xX9CYyqfuoM8okZ0fIjpbVSqMgH0jxkV010tZB24X OsRpjgwtFa36irfyNWJSB+2x4vKzgFqiMmZ0Qw/97w8P4ai1biqYyD5u4gd11WzpVqXgNtxQg AiJ2eWADmfzl6HBzX 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=212.227.15.4; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:18:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/e/=X.bfbwuHB/7/B5eifMbe Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace duplicate code with pick_qemu_util. Signed-off-by: Lukas Straub --- tests/acceptance/boot_linux.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 075a386300..6b99112cad 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -44,15 +44,8 @@ class BootLinux(Test): def prepare_boot(self): self.log.debug('Looking for and selecting a qemu-img binary to be ' 'used to create the bootable snapshot image') - # If qemu-img has been built, use it, otherwise the system wide one - # will be used. If none is available, the test will cancel. - qemu_img =3D os.path.join(BUILD_DIR, 'qemu-img') - if not os.path.exists(qemu_img): - qemu_img =3D find_command('qemu-img', False) - if qemu_img is False: - self.cancel('Could not find "qemu-img", which is required to ' - 'create the bootable image') - vmimage.QEMU_IMG =3D qemu_img + + vmimage.QEMU_IMG =3D self.pick_qemu_util("qemu-img") self.log.info('Downloading/preparing boot image') # Fedora 31 only provides ppc64le images -- 2.20.1 --Sig_/e/=X.bfbwuHB/7/B5eifMbe Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b6+kACgkQNasLKJxd slghhw//S2SVzB2lFIybUSDnbYpv7i3wCAcROhQYs8RXbDl/GiezyNigFQb6S/hV 4BuIEaRi5VHnVf6oKXa2tdZNw/3+N8nF7KouFsmBcGr7GlHTCY3i167bLV21Qmc8 aWzaWxhuyGqXKQ40dVS8LcY3fxeEgiPWDtT07SOPgaWog6vhxB4Vyh7CadlB6ANS zCON3oJSjnOLGomWCNG0uzwH4gfFmDiAuqGfz9RFDmXWFTWOlHA5CeMKrExxMyvC uuz9tmpkT7H/H9p2moTJg7pgfKDvlH/3zlwbegU3nL/kksFuhrS8oBhOCNXtEB1q Qres8S5z/k4Itk3oJM9JK8KBwV+bHgoNg9wnZZ/xdJSW4fHCOwcfd9gidPOIoiQd arOt2ImqnU0Ixwrpxz3CNy27+G1SVwElIbz1flmgVQ6trDNTKYdLi+nzz0GC/8B1 W3Pp/hXcuzhHm3HRh29UgVRvbhfS7RDW8u/G0J2Af870XLno4GgUZj1SVKj3jqc0 sA632OjySLH7VOTlui8oVf0Ty6ilPqlBJePipgwxpwGQE7i8R68jfwemMj0I70GY XHhe/NDEy8QG/x+BgNt604MOK8FUCPmpZGI247xgw6JMPAbwyDUGrSmUaEaIDlkD vm1sCn6EDBi/WapQZFE0oK1HQTyQLk4z86pADjI7QoQlTkskqYQ= =w4F8 -----END PGP SIGNATURE----- --Sig_/e/=X.bfbwuHB/7/B5eifMbe-- From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591471677; cv=none; d=zohomail.com; s=zohoarc; b=K3Kd83omXbpk3YoN4vjMA2x5zd23XQPcDwPxbT1wpN5gb+c1EpfKobQSN5RUR6uDr7iehQowEPM7RFB1Tk1aYIjxag/HR90wvsXOYYMQJigK1eZRedC3yKZbkrcUSy1cdt6KZzMmWUqpoPcGGsTl/dE72ZDoFznnWfpg1SBUinw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591471677; h=Content-Type: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=Z0XnuN00P6DEuA9+7wEb2K1wPsdOJONXAuyfSpsjXQ4=; b=Op7Of7yfSd2gDpFp1okHdFPF2lKtSQDjrtUcP8YXT5p4Mj7ZywJoAAfHEb53tXipgxhG2o34g3d8E65HvnYT2GbyFA8T9j/0ac/xP7X9rIdcsXvHC7Lfu7dSRF3hD8n40eCn+VWs/8UTDmNZadWf344x1/Z7Z0Y4kwJbbrPkfxI= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591471677220988.222911038907; Sat, 6 Jun 2020 12:27:57 -0700 (PDT) Received: from localhost ([::1]:48292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheTz-00030Q-AY for importer@patchew.org; Sat, 06 Jun 2020 15:27:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL1-0004Z9-HS for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:39 -0400 Received: from mout.web.de ([217.72.192.78]:37393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheKw-0005bI-TM for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:39 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lcxxc-1jH4wD0d04-00iDTj; Sat, 06 Jun 2020 21:18:09 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471089; bh=w+p0guHiUjBLkjCRlSGRdyNWlATP1EHeRNP8PAt3sMk=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=FNMnROHjVTSyhKDui5EVA2owJf7bpDKD9UgoePFqMADWdVWxLqN+W0RUtElCbgJPn 9boAau2FBMAUUzwd1cBAFhMWtRktBWBQ45qhkYG7jLILLzASxM8iAQy5/V2T22KNAO yMMQ/MLYvzDuHA9N58ZNe8SRWvSItoTnbGZ79nds= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:18:07 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 4/7] colo: Introduce resource agent Message-ID: <517ce65321a13d28614b19e7b14c98d7b5fa7040.1591456338.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/11BKVz66ZlFQWJRCkGW5Y9A"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:6lzpxWpUtp7V/rRNsbShD2mVrwDl1yNOTIq7hRkVRJhvflezHtR wPEYV+aKEZCmK3veOrfjQ62cyviq/PAz7IvEDb8noJqrM/sWvz2Hofc+Pvb/kjsX4T7ku8H Irdsrn11eojoqZOBeJxldbfgzINZZCCXu2+fo4YRNDkblXOefoOEOwhzo+g9cBKBC45NRmr oWtnMUI7KOiOz0o2hT38w== X-UI-Out-Filterresults: notjunk:1;V03:K0:Qulw3/FogI8=:vscVbkkSBKqUr6ROgfIpmg RLEUzxj0H7y2UCUelSIYY5t16H0cfVncDl9nMeyN1wWkh/YKNr37dtIxkP73qrU0T164nj/Ke 0gVa5iIganUG0p7GgxT9hX0KiUQ1+sR6uI2jPfzzJsyWkXnIFHn+aOBFOnNdps+NoGTlCLCKn BV/0Lsb19Xg6Twnv37qfeVDGFegRMUhEoD0pFMrTTwNBGb/ugrdVM4V9mt75XAk7jtsyc1UpI Vm0sovI0TIxyLPrPQiNQe596PVHBffriuQriFHAZR6UyzVrCeIJEGRvhyoPNpYNZ94FusGJ96 qYrPeA5MA/jAsbP48pl6eJ7mdXT3YPQEtRkUtl5vG1GYONxbPbN4ZNw2wehS7gr73MoyoMJda +oxMK1v9UzR9NYf/jDPWyUcctcRvvSMipqbuZPa9H8FHS0QtPBdoWuakBfyIxOc9IQaDgruc0 r33ZA1iSmiok8OV7Zly+EAdZoh8ATX5r1SwdVfUt1yNaccjO6b3UnADQAgrd4JaHlkh+3Qv0y KVieuT6RLcUkJquUhPb+ooKfF0rEf6z7hknGF5U1b7obG/6LfdwJ7PS2LVd9N/x7Mgi9uAIFX /3RJp5Z5vED39Zla0xsaPbBQ8p45VGat0O9bf0YPzeXMbNJ7/hf1d0OxAHjHN0813v2dahRFX bmGvHHfAbKY7oJffbO5wtdt7tAOZ9zW+ypJjkLWIERjclDxYBFnDFDrpcdLuubNNURiyD4stv HTWSsd4dfkXGkesNDK9gkT6A+fDDLlnksXNFMdFhxMOouaj38+z7zyf/Ce9hSSdfW56yyR/Ff 2fUM3DxBawcL8JRfM9CLl9LI29922K0f2yRTcnYWAcQ7q0HmGNX1zuOLEHRySrIwVx7Ex/gGY CjFB2ZtUEZqI/+Fl6TcyBlJ/3D3LawKljVL25hRX8H58hphZjAuPEAfkUccWJQaW8NiB+w1nG 27PDnd0M66NHj9xy5kQvaCikuRLrr9yyWCxAgtGvRxDv6ek0J/aq/OmZ0ltFChLt39OMHOYQM Huqo7W2J1cflA09z9wfGT+toHAaRJQCxrrOVrKxtv7ByyYcm6TNhg2MCGPt8k9MgSFnEIyyb1 hXrptLNH+3IsGXWoMM44AVbxa/XLHg2c5fwwBnpU9aY5p4Zci9kkzsmfR9rJyn1sSgZ80GEJU vvzCrUKk01NoIYJeXHCnWQkW3+ejgoKowZaTnLAHmuzZOu2gfyl6tIVskQegQTekwWibC0JRh zDLPyWqd+arl7kFrS 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=217.72.192.78; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:18:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001, WEIRD_QUOTING=0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/11BKVz66ZlFQWJRCkGW5Y9A Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Introduce a resource agent which can be used to manage qemu COLO in a pacemaker cluster. Signed-off-by: Lukas Straub --- scripts/colo-resource-agent/colo | 1466 ++++++++++++++++++++++++++++++ 1 file changed, 1466 insertions(+) create mode 100755 scripts/colo-resource-agent/colo diff --git a/scripts/colo-resource-agent/colo b/scripts/colo-resource-agent= /colo new file mode 100755 index 0000000000..725fa8e492 --- /dev/null +++ b/scripts/colo-resource-agent/colo @@ -0,0 +1,1466 @@ +#!/usr/bin/env python3 + +# Resource agent for qemu COLO for use with Pacemaker CRM +# +# Copyright (c) Lukas Straub +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from __future__ import print_function +import subprocess +import sys +import os +import os.path +import signal +import socket +import select +import json +import re +import time +import logging +import logging.handlers + +# Constants +OCF_SUCCESS =3D 0 +OCF_ERR_GENERIC =3D 1 +OCF_ERR_ARGS =3D 2 +OCF_ERR_UNIMPLEMENTED =3D 3 +OCF_ERR_PERM =3D 4 +OCF_ERR_INSTALLED =3D 5 +OCF_ERR_CONFIGURED =3D 6 +OCF_NOT_RUNNING =3D 7 +OCF_RUNNING_MASTER =3D 8 +OCF_FAILED_MASTER =3D 9 + +# Get environment variables +OCF_RESKEY_CRM_meta_notify_type \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_type") +OCF_RESKEY_CRM_meta_notify_operation \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_operation") +OCF_RESKEY_CRM_meta_notify_key_operation \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_key_operation") +OCF_RESKEY_CRM_meta_notify_start_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_start_uname", "") +OCF_RESKEY_CRM_meta_notify_stop_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_stop_uname", "") +OCF_RESKEY_CRM_meta_notify_active_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_active_uname", "") +OCF_RESKEY_CRM_meta_notify_promote_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_promote_uname", "") +OCF_RESKEY_CRM_meta_notify_demote_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_demote_uname", "") +OCF_RESKEY_CRM_meta_notify_master_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_master_uname", "") +OCF_RESKEY_CRM_meta_notify_slave_uname \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify_slave_uname", "") + +HA_RSCTMP =3D os.getenv("HA_RSCTMP", "/run/resource-agents") +HA_LOGFACILITY =3D os.getenv("HA_LOGFACILITY") +HA_LOGFILE =3D os.getenv("HA_LOGFILE") +HA_DEBUG =3D os.getenv("HA_debug", "0") +HA_DEBUGLOG =3D os.getenv("HA_DEBUGLOG") +OCF_RESOURCE_INSTANCE =3D os.getenv("OCF_RESOURCE_INSTANCE", "default-inst= ance") +OCF_RESKEY_CRM_meta_timeout \ + =3D os.getenv("OCF_RESKEY_CRM_meta_timeout", "60000") +OCF_RESKEY_CRM_meta_interval \ + =3D int(os.getenv("OCF_RESKEY_CRM_meta_interval", "1")) +OCF_RESKEY_CRM_meta_clone_max \ + =3D int(os.getenv("OCF_RESKEY_CRM_meta_clone_max", "1")) +OCF_RESKEY_CRM_meta_clone_node_max \ + =3D int(os.getenv("OCF_RESKEY_CRM_meta_clone_node_max", "1")) +OCF_RESKEY_CRM_meta_master_max \ + =3D int(os.getenv("OCF_RESKEY_CRM_meta_master_max", "1")) +OCF_RESKEY_CRM_meta_master_node_max \ + =3D int(os.getenv("OCF_RESKEY_CRM_meta_master_node_max", "1")) +OCF_RESKEY_CRM_meta_notify \ + =3D os.getenv("OCF_RESKEY_CRM_meta_notify") +OCF_RESKEY_CRM_meta_globally_unique \ + =3D os.getenv("OCF_RESKEY_CRM_meta_globally_unique") + +HOSTNAME =3D os.getenv("OCF_RESKEY_CRM_meta_on_node", socket.gethostname()) + +OCF_ACTION =3D os.getenv("__OCF_ACTION") +if not OCF_ACTION and len(sys.argv) =3D=3D 2: + OCF_ACTION =3D sys.argv[1] + +# Resource parameters +OCF_RESKEY_qemu_binary_default =3D "qemu-system-x86_64" +OCF_RESKEY_qemu_img_binary_default =3D "qemu-img" +OCF_RESKEY_log_dir_default =3D HA_RSCTMP +OCF_RESKEY_options_default =3D "" +OCF_RESKEY_active_hidden_dir_default =3D "" +OCF_RESKEY_listen_address_default =3D "0.0.0.0" +OCF_RESKEY_base_port_default =3D "9000" +OCF_RESKEY_checkpoint_interval_default =3D "20000" +OCF_RESKEY_compare_timeout_default =3D "3000" +OCF_RESKEY_expired_scan_cycle_default =3D "3000" +OCF_RESKEY_use_filter_rewriter_default =3D "true" +OCF_RESKEY_vnet_hdr_default =3D "false" +OCF_RESKEY_max_disk_errors_default =3D "1" +OCF_RESKEY_monitor_timeout_default =3D "20000" +OCF_RESKEY_yank_timeout_default =3D "10000" +OCF_RESKEY_fail_fast_timeout_default =3D "5000" +OCF_RESKEY_debug_default =3D "0" + +OCF_RESKEY_qemu_binary \ + =3D os.getenv("OCF_RESKEY_qemu_binary", OCF_RESKEY_qemu_binary_default) +OCF_RESKEY_qemu_img_binary \ + =3D os.getenv("OCF_RESKEY_qemu_img_binary", OCF_RESKEY_qemu_img_binary= _default) +OCF_RESKEY_log_dir \ + =3D os.getenv("OCF_RESKEY_log_dir", OCF_RESKEY_log_dir_default) +OCF_RESKEY_options \ + =3D os.getenv("OCF_RESKEY_options", OCF_RESKEY_options_default) +OCF_RESKEY_active_hidden_dir \ + =3D os.getenv("OCF_RESKEY_active_hidden_dir", OCF_RESKEY_active_hidden= _dir_default) +OCF_RESKEY_listen_address \ + =3D os.getenv("OCF_RESKEY_listen_address", OCF_RESKEY_listen_address_d= efault) +OCF_RESKEY_base_port \ + =3D os.getenv("OCF_RESKEY_base_port", OCF_RESKEY_base_port_default) +OCF_RESKEY_checkpoint_interval \ + =3D os.getenv("OCF_RESKEY_checkpoint_interval", OCF_RESKEY_checkpoint_= interval_default) +OCF_RESKEY_compare_timeout \ + =3D os.getenv("OCF_RESKEY_compare_timeout", OCF_RESKEY_compare_timeout= _default) +OCF_RESKEY_expired_scan_cycle \ + =3D os.getenv("OCF_RESKEY_expired_scan_cycle", OCF_RESKEY_expired_scan= _cycle_default) +OCF_RESKEY_use_filter_rewriter \ + =3D os.getenv("OCF_RESKEY_use_filter_rewriter", OCF_RESKEY_use_filter_= rewriter_default) +OCF_RESKEY_vnet_hdr \ + =3D os.getenv("OCF_RESKEY_vnet_hdr", OCF_RESKEY_vnet_hdr_default) +OCF_RESKEY_max_disk_errors \ + =3D os.getenv("OCF_RESKEY_max_disk_errors", OCF_RESKEY_max_disk_errors= _default) +OCF_RESKEY_monitor_timeout \ + =3D os.getenv("OCF_RESKEY_monitor_timeout", OCF_RESKEY_monitor_timeout= _default) +OCF_RESKEY_yank_timeout \ + =3D os.getenv("OCF_RESKEY_yank_timeout", OCF_RESKEY_yank_timeout_defau= lt) +OCF_RESKEY_fail_fast_timeout \ + =3D os.getenv("OCF_RESKEY_fail_fast_timeout", OCF_RESKEY_fail_fast_tim= eout_default) +OCF_RESKEY_debug \ + =3D os.getenv("OCF_RESKEY_debug", OCF_RESKEY_debug_default) + +ACTIVE_IMAGE =3D os.path.join(OCF_RESKEY_active_hidden_dir, \ + OCF_RESOURCE_INSTANCE + "-active.qcow2") +HIDDEN_IMAGE =3D os.path.join(OCF_RESKEY_active_hidden_dir, \ + OCF_RESOURCE_INSTANCE + "-hidden.qcow2") + +QMP_SOCK =3D os.path.join(HA_RSCTMP, OCF_RESOURCE_INSTANCE + "-qmp.sock") +HELPER_SOCK =3D os.path.join(HA_RSCTMP, OCF_RESOURCE_INSTANCE + "-helper.s= ock") +COMP_SOCK =3D os.path.join(HA_RSCTMP, OCF_RESOURCE_INSTANCE + "-compare.so= ck") +COMP_OUT_SOCK =3D os.path.join(HA_RSCTMP, OCF_RESOURCE_INSTANCE \ + + "-comp_out.sock") + +PID_FILE =3D os.path.join(HA_RSCTMP, OCF_RESOURCE_INSTANCE + "-qemu.pid") + +QMP_LOG =3D os.path.join(OCF_RESKEY_log_dir, OCF_RESOURCE_INSTANCE + "-qmp= .log") +QEMU_LOG =3D os.path.join(OCF_RESKEY_log_dir, OCF_RESOURCE_INSTANCE + "-qe= mu.log") +HELPER_LOG =3D os.path.join(OCF_RESKEY_log_dir, OCF_RESOURCE_INSTANCE \ + + "-helper= .log") + +START_TIME =3D time.time() +did_yank =3D False + +# Exception only raised by ourself +class Error(Exception): + pass + +def setup_constants(): + # This function is called after the parameters where validated + global OCF_RESKEY_CRM_meta_timeout + if OCF_ACTION =3D=3D "monitor": + OCF_RESKEY_CRM_meta_timeout =3D OCF_RESKEY_monitor_timeout + + global MIGRATE_PORT, MIRROR_PORT, COMPARE_IN_PORT, NBD_PORT + MIGRATE_PORT =3D int(OCF_RESKEY_base_port) + MIRROR_PORT =3D int(OCF_RESKEY_base_port) + 1 + COMPARE_IN_PORT =3D int(OCF_RESKEY_base_port) + 2 + NBD_PORT =3D int(OCF_RESKEY_base_port) + 3 + + global QEMU_PRIMARY_CMDLINE + QEMU_PRIMARY_CMDLINE =3D \ + ("'%(OCF_RESKEY_qemu_binary)s' %(OCF_RESKEY_options)s" + " -drive if=3Dnone,node-name=3Dcolo-disk0,driver=3Dquorum,read-pat= tern=3Dfifo," + "vote-threshold=3D1,children.0=3Dparent0" + " -qmp unix:'%(QMP_SOCK)s',server,nowait" + " -daemonize -D '%(QEMU_LOG)s' -pidfile '%(PID_FILE)s'") % globals= () + + global QEMU_SECONDARY_CMDLINE + QEMU_SECONDARY_CMDLINE =3D \ + ("'%(OCF_RESKEY_qemu_binary)s' %(OCF_RESKEY_options)s" + " -chardev socket,id=3Dred0,host=3D'%(OCF_RESKEY_listen_address)s'= ," + "port=3D%(MIRROR_PORT)s,server,nowait,nodelay" + " -chardev socket,id=3Dred1,host=3D'%(OCF_RESKEY_listen_address)s'= ," + "port=3D%(COMPARE_IN_PORT)s,server,nowait,nodelay" + " -object filter-redirector,id=3Df1,netdev=3Dhn0,queue=3Dtx,indev= =3Dred0" + " -object filter-redirector,id=3Df2,netdev=3Dhn0,queue=3Drx,outdev= =3Dred1") \ + % globals() + + if is_true(OCF_RESKEY_use_filter_rewriter): + QEMU_SECONDARY_CMDLINE +=3D \ + " -object filter-rewriter,id=3Drew0,netdev=3Dhn0,queue=3Dall" + + QEMU_SECONDARY_CMDLINE +=3D \ + (" -drive if=3Dnone,node-name=3Dchilds0,top-id=3Dcolo-disk0," + "driver=3Dreplication,mode=3Dsecondary,file.driver=3Dqcow2," + "file.file.filename=3D'%(ACTIVE_IMAGE)s',file.backing.driver=3Dqco= w2," + "file.backing.file.filename=3D'%(HIDDEN_IMAGE)s'," + "file.backing.backing=3Dparent0" + " -drive if=3Dnone,node-name=3Dcolo-disk0,driver=3Dquorum,read-pat= tern=3Dfifo," + "vote-threshold=3D1,children.0=3Dchilds0" + " -incoming tcp:'%(OCF_RESKEY_listen_address)s':%(MIGRATE_PORT)s" + " -qmp unix:'%(QMP_SOCK)s',server,nowait" + " -daemonize -D '%(QEMU_LOG)s' -pidfile '%(PID_FILE)s'") % globals= () + + global QEMU_DUMMY_CMDLINE + QEMU_DUMMY_CMDLINE =3D \ + ("'%(OCF_RESKEY_qemu_binary)s' %(OCF_RESKEY_options)s" + " -drive if=3Dnone,node-name=3Dcolo-disk0,driver=3Dnull-co -S" + " -qmp unix:'%(QMP_SOCK)s',server,nowait" + " -daemonize -D '%(QEMU_LOG)s' -pidfile '%(PID_FILE)s'") % globals= () + +def qemu_colo_meta_data(): + print("""\ + + + + + 1.0 + +Resource agent for qemu COLO. (https://wiki.qemu.org/Features/COLO) + +After defining the master/slave instance, the master score has to be +manually set to show which node has up-to-date data. So you copy your +image to one host (and create empty images the other host(s)) and then +run "crm_master -r name_of_your_primitive -v 10" on that host. +Also, you have to set 'notify=3Dtrue' in the metadata attributes when +defining the master/slave instance. + +Note: +-If the instance is stopped cluster-wide, the resource agent will do a +clean shutdown. Set the demote timeout to the time it takes for your +guest to shutdown. +-Colo replication is started from the monitor action. Set the monitor +timeout to at least the time it takes for replication to start. You can +set the monitor_timeout parameter for a soft timeout, which the resource +agent tries to satisfy. +-The resource agent may notify pacemaker about peer failure, +these failures will show up with exitreason=3D"Simulated failure". + + Qemu COLO + + + + + qemu binary to use + qemu binary + + + + + qemu-img binary to use + qemu-img binary + + + + + Directory to place logs in + Log directory + + + + + +Options to pass to qemu. These will be passed alongside COLO specific +options, so you need to follow these conventions: The netdev should have +id=3Dhn0 and the disk controller drive=3Dcolo-disk0. The image node should +have node-name=3Dparent0, but should not be connected to the guest. +Example: +-vnc :0 -enable-kvm -cpu qemu64,+kvmclock -m 512 -netdev bridge,id=3Dhn0 +-device e1000,netdev=3Dhn0 -device virtio-blk,drive=3Dcolo-disk0 +-drive if=3Dnone,node-name=3Dparent0,format=3Dqcow2,file=3D/mnt/vms/vm01.q= cow2 + + Options to pass to qemu. + + + + +Directory where the active and hidden images will be stored. It is +recommended to put this on a ramdisk. + + Path to active and hidden images + + + + + Address to listen on. + Listen address + + + + + +4 tcp ports that are unique for each instance. (base_port to base_port + 3) + + Ports to use + + + + + +Interval for regular checkpoints in milliseconds. + + Interval for regular checkpoints + + + + + +Maximum time to hold a primary packet if secondary hasn't sent it yet, +in milliseconds. +You should also adjust "expired_scan_cycle" accordingly. + + Compare timeout + + + + + +Interval for checking for expired primary packets in milliseconds. + + Expired packet check interval + + + + + +Use filter-rewriter to increase similarity between the VMs. + + Use filter-rewriter + + + + + +Set this to true if your system supports vnet_hdr and you enabled +it on the tap netdev. + + vnet_hdr support + + + + + +Maximum disk read errors per monitor interval before marking the resource +as failed. A write error is always fatal except if the value is 0. +A value of 0 will disable disk error handling. +Primary disk errors are only handled if there is a healthy secondary. + + Maximum disk errors + + + + + +Soft timeout for monitor, in milliseconds. +Must be lower than the monitor action timeout. + + Monitor timeout + + + + + +Timeout for QMP commands after which to execute the "yank" command, +in milliseconds. +Must be lower than any of the action timeouts. + + Yank timeout + + + + + +Timeout for QMP commands used in the stop and demote actions to speed +up recovery from a hanging qemu, in milliseconds. +Must be lower than any of the action timeouts. + + Timeout for fast paths + + + + + +Control debugging: +0: disable debugging +1: log debug messages and qmp commands +2: + dump core of hanging qemu + + Control debugging + + + + + + + + + + + + + + + + + + +""") + +def logs_open(): + global log + log =3D logging.getLogger(OCF_RESOURCE_INSTANCE) + if int(OCF_RESKEY_debug) >=3D 1 or HA_DEBUG !=3D "0": + log.setLevel(logging.DEBUG) + else: + log.setLevel(logging.INFO) + + formater =3D logging.Formatter("(%(name)s) %(levelname)s: %(message)s") + + if sys.stdout.isatty(): + handler =3D logging.StreamHandler(stream=3Dsys.stderr) + handler.setFormatter(formater) + log.addHandler(handler) + + if HA_LOGFACILITY: + handler =3D logging.handlers.SysLogHandler("/dev/log") + handler.setFormatter(formater) + log.addHandler(handler) + + if HA_LOGFILE: + handler =3D logging.FileHandler(HA_LOGFILE) + handler.setFormatter(formater) + log.addHandler(handler) + + if HA_DEBUGLOG and HA_DEBUGLOG !=3D HA_LOGFILE: + handler =3D logging.FileHandler(HA_DEBUGLOG) + handler.setFormatter(formater) + log.addHandler(handler) + + global qmp_log + qmp_log =3D logging.getLogger("qmp_log") + qmp_log.setLevel(logging.DEBUG) + formater =3D logging.Formatter("%(message)s") + + if int(OCF_RESKEY_debug) >=3D 1: + handler =3D logging.handlers.WatchedFileHandler(QMP_LOG) + handler.setFormatter(formater) + qmp_log.addHandler(handler) + else: + handler =3D logging.NullHandler() + qmp_log.addHandler(handler) + +def rotate_logfile(logfile, numlogs): + numlogs -=3D 1 + for n in range(numlogs, -1, -1): + file =3D logfile + if n !=3D 0: + file =3D "%s.%s" % (file, n) + if os.path.exists(file): + if n =3D=3D numlogs: + os.remove(file) + else: + newname =3D "%s.%s" % (logfile, n + 1) + os.rename(file, newname) + +def is_writable(file): + return os.access(file, os.W_OK) + +def is_executable_file(file): + return os.path.isfile(file) and os.access(file, os.X_OK) + +def is_true(var): + return re.match("yes|true|1|YES|TRUE|True|ja|on|ON", str(var)) !=3D No= ne + +# Check if the binary exists and is executable +def check_binary(binary): + if is_executable_file(binary): + return True + PATH =3D os.getenv("PATH", os.defpath) + for dir in PATH.split(os.pathsep): + if is_executable_file(os.path.join(dir, binary)): + return True + log.error("binary \"%s\" doesn't exist or not executable" % binary) + return False + +def run_command(commandline): + proc =3D subprocess.Popen(commandline, shell=3DTrue, stdout=3Dsubproce= ss.PIPE, + stderr=3Dsubprocess.STDOUT, universal_newlines= =3DTrue) + stdout, stderr =3D proc.communicate() + if proc.returncode !=3D 0: + log.error("command \"%s\" failed with code %s:\n%s" \ + % (commandline, proc.returncode, stdout)) + raise Error() + +# Functions for setting and getting the master score to tell Pacemaker whi= ch +# host has the most recent data +def set_master_score(score): + if score =3D=3D 0: + run_command("crm_master -q -l forever -D") + else: + run_command("crm_master -q -l forever -v %s" % score) + +def set_remote_master_score(remote, score): + if score =3D=3D 0: + run_command("crm_master -q -l forever -N '%s' -D" % remote) + else: + run_command("crm_master -q -l forever -N '%s' -v %s" % (remote, sc= ore)) + +def get_master_score(): + proc =3D subprocess.Popen("crm_master -q -G", shell=3DTrue, + stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.= DEVNULL, + universal_newlines=3DTrue) + stdout, stderr =3D proc.communicate() + if proc.returncode !=3D 0: + return 0 + else: + return int(str.strip(stdout)) + +def get_remote_master_score(remote): + proc =3D subprocess.Popen("crm_master -q -N '%s' -G" % remote, shell= =3DTrue, + stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.= DEVNULL, + universal_newlines=3DTrue) + stdout, stderr =3D proc.communicate() + if proc.returncode !=3D 0: + return 0 + else: + return int(str.strip(stdout)) + +# Tell Pacemaker that the remote resource failed +def report_remote_failure(remote): + run_command("crm_resource --resource '%s' --fail --node '%s'" + % (OCF_RESOURCE_INSTANCE, remote)) + +def recv_line(fd): + line =3D "" + while True: + tmp =3D fd.recv(1).decode() + line +=3D tmp + if tmp =3D=3D "\n" or len(tmp) =3D=3D 0: + break + return line + +# Filter out events +def read_answer(fd): + while True: + line =3D recv_line(fd) + qmp_log.debug(str.strip(line)) + + if len(line) =3D=3D 0: + log.error("qmp connection closed") + raise Error() + + answer =3D json.loads(line) + # Ignore everything else + if "return" in answer or "error" in answer: + break + return answer + +# Execute one or more qmp commands +def qmp_execute(fd, commands, ignore_error =3D False, do_yank =3D True): + for command in commands: + if not command: + continue + + try: + to_send =3D json.dumps(command) + fd.sendall(str.encode(to_send + "\n")) + qmp_log.debug(to_send) + + answer =3D read_answer(fd) + except Exception as e: + if isinstance(e, socket.timeout) and do_yank: + log.warning("Command timed out, trying to unfreeze qemu") + new_timeout =3D max(2, (int(OCF_RESKEY_CRM_meta_timeout)/1= 000) \ + - (time.time() - START_TIME) - 2) + fd.settimeout(new_timeout) + try: + # answer is the answer of timed-out command + answer =3D yank(fd) + if not answer: + answer =3D read_answer(fd) + except socket.error as e: + log.error("while reading answer of timed out command: " + "%s\n%s" % (json.dumps(command), e)) + raise Error() + elif isinstance(e, socket.timeout) or isinstance(e, socket.err= or): + log.error("while executing qmp command: %s\n%s" \ + % (json.dumps(command), e)) + raise Error() + else: + raise + + if not ignore_error and ("error" in answer): + log.error("qmp command returned error:\n%s\n%s" \ + % (json.dumps(command), json.dumps(answer))) + raise Error() + + return answer + +# Open qemu qmp connection +def qmp_open(fail_fast =3D False): + if fail_fast: + timeout =3D int(OCF_RESKEY_fail_fast_timeout)/1000 + else: + timeout =3D int(OCF_RESKEY_yank_timeout)/1000 + + try: + fd =3D socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + fd.settimeout(timeout) + fd.connect(HELPER_SOCK) + except socket.error as e: + log.error("while connecting to helper socket: %s" % e) + raise Error() + + return fd + +def yank(fd): + global did_yank + did_yank =3D True + ret =3D None + while True: + answer =3D qmp_execute(fd, [{"exec-oob": "query-yank", "id": "yank= 0"}], \ + do_yank =3D False, ignore_error =3D True) + if "id" not in answer: + # This is the answer of the timed-out command + ret =3D answer + answer =3D read_answer(fd) + if "error" in answer: + log.error("While executing 'query-yank':\n%s" % json.dumps(ans= wer)) + raise Error() + instances =3D [] + for n in answer["return"]["instances"]: + if n =3D=3D "blockdev:nbd0" or n =3D=3D "chardev:mirror0" \ + or n =3D=3D "chardev:comp_sec_in0" or n =3D=3D "migration" \ + or n =3D=3D "chardev:red0" or n =3D=3D "chardev:red1": + instances.append(n) + answer =3D qmp_execute(fd, [{"exec-oob": "yank", "id": "yank0", "a= rguments":{ "instances": instances }}], \ + do_yank =3D False, ignore_error =3D True) + if "id" not in answer: + # This is the answer of the timed-out command + ret =3D answer + answer =3D read_answer(fd) + if "error" in answer: + if answer["error"]["class"] =3D=3D "DeviceNotFound": + continue + else: + log.error("While executing 'yank':\n%s" % json.dumps(answe= r)) + raise Error() + break + + return ret + +def oob_helper_exec(client, cmd, events): + if cmd["exec-helper"] =3D=3D "get-events": + event =3D cmd["arguments"]["event"] + if (event in events): + to_send =3D json.dumps({"return": events[event]}) + client.sendall(str.encode(to_send + "\n")) + else: + client.sendall(str.encode("{\"return\": []}\n")) + elif cmd["exec-helper"] =3D=3D "clear-events": + events.clear() + client.sendall(str.encode("{\"return\": {}}\n")) + else: + client.sendall(str.encode("{\"error\": \"Unknown helper command\"}= \n")) + +def oob_helper(qmp, server): + max_events =3D max(100, int(OCF_RESKEY_max_disk_errors)) + events =3D {} + try: + os.close(0) + os.close(1) + os.close(2) + logging.shutdown() + + client =3D None + while True: + if client: + watch =3D [client, qmp] + else: + watch =3D [server, qmp] + sel =3D select.select(watch, [], []) + try: + if client in sel[0]: + cmd =3D recv_line(client) + if len(cmd) =3D=3D 0: + # client socket was closed: wait for new client + client.close() + client =3D None + continue + else: + parsed =3D json.loads(cmd) + if ("exec-helper" in parsed): + oob_helper_exec(client, parsed, events) + else: + qmp.sendall(str.encode(cmd)) + if qmp in sel[0]: + answer =3D recv_line(qmp) + if len(answer) =3D=3D 0: + # qmp socket was closed: qemu died, exit + os._exit(0) + else: + parsed =3D json.loads(answer) + if ("event" in parsed): + event =3D parsed["event"] + if (event not in events): + events[event] =3D [] + if len(events[event]) < max_events: + events[event].append(parsed) + elif client: + client.sendall(str.encode(answer)) + if server in sel[0]: + client, client_addr =3D server.accept() + except socket.error as e: + pass + except Exception as e: + with open(HELPER_LOG, 'a') as f: + f.write(str(e) + "\n") + os._exit(0) + +# Fork off helper to keep the oob qmp connection open and to catch events +def oob_helper_open(): + try: + qmp =3D socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + qmp.connect(QMP_SOCK) + qmp_execute(qmp, [{"execute": "qmp_capabilities", "arguments": {"e= nable": ["oob"]}}]) + except socket.error as e: + log.error("while connecting to qmp socket: %s" % e) + raise Error() + + try: + if os.path.exists(HELPER_SOCK): + os.unlink(HELPER_SOCK) + server =3D socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(HELPER_SOCK) + server.listen(1) + except socket.error as e: + log.error("while opening helper socket: %s" % e) + raise Error() + + qmp.set_inheritable(True) + server.set_inheritable(True) + + try: + pid =3D os.fork() + except OSError as e: + log.error("while forking off oob helper: %s" % e) + raise Error() + + if pid =3D=3D 0: + # child 1: Exits after forking off child 2, so pid 1 will become + # responsible for the child + os.setsid() + + pid =3D os.fork() + + if pid =3D=3D 0: + # child 2: here the actual work is being done + oob_helper(qmp, server) + else: + os._exit(0) + + qmp.close() + server.close() + +# Get the disk size of the (user supplied) parent disk +def qmp_get_disk_size(fd): + block_nodes =3D qmp_execute(fd, [{"execute": "query-named-block-nodes"= , "arguments": {"flat": True}}]) + for node in block_nodes["return"]: + if node["node-name"] =3D=3D "parent0": + return node["image"]["virtual-size"] + + log.error("Disk \"parent0\" not found") + raise Error() + +# Get the host of the nbd node +def qmp_get_nbd_remote(fd): + block_nodes =3D qmp_execute(fd, [{"execute": "query-named-block-nodes"= , "arguments": {"flat": True}}]) + for node in block_nodes["return"]: + if node["node-name"] =3D=3D "nbd0": + url =3D str(node["image"]["filename"]) + return str.split(url, "//")[1].split("/")[0].split(":")[0] + return None + +# Check if we are currently resyncing +def qmp_check_resync(fd): + answer =3D qmp_execute(fd, [{"execute": "query-block-jobs"}]) + for job in answer["return"]: + if job["device"] =3D=3D "resync": + return job + return None + +def qmp_start_resync(fd, remote): + answer =3D qmp_execute(fd, [{"execute": "blockdev-add", "arguments": {= "driver": "nbd", "node-name": "nbd0", "server": {"type": "inet", "host": st= r(remote), "port": str(NBD_PORT)}, "export": "parent0", "detect-zeroes": "o= n"}}], ignore_error =3D True) + if "error" in answer: + log.warning("Failed to add nbd node: %s" % json.dumps(answer)) + log.warning("Assuming peer failure") + report_remote_failure(remote) + else: + qmp_execute(fd, [{"execute": "blockdev-mirror", "arguments": {"dev= ice": "colo-disk0", "job-id": "resync", "target": "nbd0", "sync": "full", "= on-target-error": "report", "on-source-error": "ignore", "auto-dismiss": Fa= lse}}]) + +def qmp_cancel_resync(fd): + timeout =3D START_TIME + (int(OCF_RESKEY_yank_timeout)/1000) + + if qmp_check_resync(fd)["status"] !=3D "concluded": + qmp_execute(fd, [{"execute": "block-job-cancel", "arguments": {"de= vice": "resync", "force": True}}], ignore_error =3D True) + # Wait for the block-job to finish + while time.time() < timeout: + if qmp_check_resync(fd)["status"] =3D=3D "concluded": + break + log.debug("Waiting for block-job to finish in qmp_cancel_resyn= c()") + time.sleep(1) + else: + log.warning("Timed out, trying to unfreeze qemu") + yank(fd) + while qmp_check_resync(fd)["status"] !=3D "concluded": + log.debug("Waiting for block-job to finish") + time.sleep(1) + + qmp_execute(fd, [ + {"execute": "block-job-dismiss", "arguments": {"id": "resync"}}, + {"execute": "blockdev-del", "arguments": {"node-name": "nbd0"}} + ]) + +def qmp_start_colo(fd, remote): + # Check if we have a filter-rewriter + answer =3D qmp_execute(fd, [{"execute": "qom-list", "arguments": {"pat= h": "/objects/rew0"}}], ignore_error =3D True) + if "error" in answer: + if answer["error"]["class"] =3D=3D "DeviceNotFound": + have_filter_rewriter =3D False + else: + log.error("While checking for filter-rewriter:\n%s" \ + % json.dumps(answer)) + raise Error() + else: + have_filter_rewriter =3D True + + # Pause VM and cancel resync + qmp_execute(fd, [ + {"execute": "stop"}, + {"execute": "block-job-cancel", "arguments": {"device": "resync"}} + ]) + + # Wait for the block-job to finish + while qmp_check_resync(fd)["status"] !=3D "concluded": + log.debug("Waiting for block-job to finish in qmp_start_colo()") + time.sleep(1) + + # Add nbd to the quorum node + qmp_execute(fd, [ + {"execute": "block-job-dismiss", "arguments": {"id": "resync"}}, + {"execute": "x-blockdev-change", "arguments": {"parent": "colo-dis= k0", "node": "nbd0"}} + ]) + + # Connect mirror and compare_in to secondary + qmp_execute(fd, [ + {"execute": "chardev-add", "arguments": {"id": "comp_pri_in0<", "b= ackend": {"type": "socket", "data": {"addr": {"type": "unix", "data": {"pat= h": str(COMP_SOCK)}}, "server": True}}}}, + {"execute": "chardev-add", "arguments": {"id": "comp_pri_in0>", "b= ackend": {"type": "socket", "data": {"addr": {"type": "unix", "data": {"pat= h": str(COMP_SOCK)}}, "server": False}}}}, + {"execute": "chardev-add", "arguments": {"id": "comp_out0<", "back= end": {"type": "socket", "data": {"addr": {"type": "unix", "data": {"path":= str(COMP_OUT_SOCK)}}, "server": True}}}}, + {"execute": "chardev-add", "arguments": {"id": "comp_out0>", "back= end": {"type": "socket", "data": {"addr": {"type": "unix", "data": {"path":= str(COMP_OUT_SOCK)}}, "server": False}}}}, + {"execute": "chardev-add", "arguments": {"id": "mirror0", "backend= ": {"type": "socket", "data": {"addr": {"type": "inet", "data": {"host": st= r(remote), "port": str(MIRROR_PORT)}}, "server": False, "nodelay": True }}}= }, + {"execute": "chardev-add", "arguments": {"id": "comp_sec_in0", "ba= ckend": {"type": "socket", "data": {"addr": {"type": "inet", "data": {"host= ": str(remote), "port": str(COMPARE_IN_PORT)}}, "server": False, "nodelay":= True }}}} + ]) + + # Add the COLO filters + vnet_hdr_support =3D is_true(OCF_RESKEY_vnet_hdr) + if have_filter_rewriter: + qmp_execute(fd, [ + {"execute": "object-add", "arguments": {"qom-type": "filter-mi= rror", "id": "m0", "props": {"insert": "before", "position": "id=3Drew0", "= netdev": "hn0", "queue": "tx", "outdev": "mirror0", "vnet_hdr_support": vne= t_hdr_support}}}, + {"execute": "object-add", "arguments": {"qom-type": "filter-re= director", "id": "redire0", "props": {"insert": "before", "position": "id= =3Drew0", "netdev": "hn0", "queue": "rx", "indev": "comp_out0<", "vnet_hdr_= support": vnet_hdr_support}}}, + {"execute": "object-add", "arguments": {"qom-type": "filter-re= director", "id": "redire1", "props": {"insert": "before", "position": "id= =3Drew0", "netdev": "hn0", "queue": "rx", "outdev": "comp_pri_in0<", "vnet_= hdr_support": vnet_hdr_support}}}, + {"execute": "object-add", "arguments": {"qom-type": "iothread"= , "id": "iothread1"}}, + {"execute": "object-add", "arguments": {"qom-type": "colo-comp= are", "id": "comp0", "props": {"primary_in": "comp_pri_in0>", "secondary_in= ": "comp_sec_in0", "outdev": "comp_out0>", "iothread": "iothread1", "compar= e_timeout": int(OCF_RESKEY_compare_timeout), "expired_scan_cycle": int(OCF_= RESKEY_expired_scan_cycle), "vnet_hdr_support": vnet_hdr_support}}} + ]) + else: + qmp_execute(fd, [ + {"execute": "object-add", "arguments": {"qom-type": "filter-mi= rror", "id": "m0", "props": {"netdev": "hn0", "queue": "tx", "outdev": "mir= ror0", "vnet_hdr_support": vnet_hdr_support}}}, + {"execute": "object-add", "arguments": {"qom-type": "filter-re= director", "id": "redire0", "props": {"netdev": "hn0", "queue": "rx", "inde= v": "comp_out0<", "vnet_hdr_support": vnet_hdr_support}}}, + {"execute": "object-add", "arguments": {"qom-type": "filter-re= director", "id": "redire1", "props": {"netdev": "hn0", "queue": "rx", "outd= ev": "comp_pri_in0<", "vnet_hdr_support": vnet_hdr_support}}}, + {"execute": "object-add", "arguments": {"qom-type": "iothread"= , "id": "iothread1"}}, + {"execute": "object-add", "arguments": {"qom-type": "colo-comp= are", "id": "comp0", "props": {"primary_in": "comp_pri_in0>", "secondary_in= ": "comp_sec_in0", "outdev": "comp_out0>", "iothread": "iothread1", "compar= e_timeout": int(OCF_RESKEY_compare_timeout), "expired_scan_cycle": int(OCF_= RESKEY_expired_scan_cycle), "vnet_hdr_support": vnet_hdr_support}}} + ]) + + # Start COLO + qmp_execute(fd, [ + {"execute": "migrate-set-capabilities", "arguments": {"capabilitie= s": [{"capability": "x-colo", "state": True }] }}, + {"execute": "migrate-set-parameters" , "arguments": {"x-checkpoint= -delay": int(OCF_RESKEY_checkpoint_interval) }}, + {"execute": "migrate", "arguments": {"uri": "tcp:%s:%s" % (remote,= MIGRATE_PORT)}} + ]) + + # Wait for COLO to start + while qmp_execute(fd, [{"execute": "query-status"}])["return"]["status= "] \ + =3D=3D "paused" \ + or qmp_execute(fd, [{"execute": "query-colo-status"}])["return= "]["mode"] \ + !=3D "primary" : + log.debug("Waiting for colo replication to start") + time.sleep(1) + +def qmp_primary_failover(fd): + qmp_execute(fd, [ + {"execute": "object-del", "arguments": {"id": "m0"}}, + {"execute": "object-del", "arguments": {"id": "redire0"}}, + {"execute": "object-del", "arguments": {"id": "redire1"}}, + {"execute": "x-colo-lost-heartbeat"}, + {"execute": "object-del", "arguments": {"id": "comp0"}}, + {"execute": "object-del", "arguments": {"id": "iothread1"}}, + {"execute": "x-blockdev-change", "arguments": {"parent": "colo-dis= k0", "child": "children.1"}}, + {"execute": "blockdev-del", "arguments": {"node-name": "nbd0"}}, + {"execute": "chardev-remove", "arguments": {"id": "mirror0"}}, + {"execute": "chardev-remove", "arguments": {"id": "comp_sec_in0"}}, + {"execute": "chardev-remove", "arguments": {"id": "comp_pri_in0>"}= }, + {"execute": "chardev-remove", "arguments": {"id": "comp_pri_in0<"}= }, + {"execute": "chardev-remove", "arguments": {"id": "comp_out0>"}}, + {"execute": "chardev-remove", "arguments": {"id": "comp_out0<"}} + ]) + +def qmp_secondary_failover(fd): + qmp_execute(fd, [ + {"execute": "nbd-server-stop"}, + {"execute": "object-del", "arguments": {"id": "f2"}}, + {"execute": "object-del", "arguments": {"id": "f1"}}, + {"execute": "x-colo-lost-heartbeat"}, + {"execute": "chardev-remove", "arguments": {"id": "red1"}}, + {"execute": "chardev-remove", "arguments": {"id": "red0"}}, + ]) + +# Check qemu health and colo role +def qmp_check_state(fd, fail_fast =3D False): + answer =3D qmp_execute(fd, [{"execute": "query-status"}], \ + do_yank =3D not fail_fast) + vm_status =3D answer["return"] + + answer =3D qmp_execute(fd, [{"execute": "query-colo-status"}], \ + do_yank =3D not fail_fast) + colo_status =3D answer["return"] + + if vm_status["status"] =3D=3D "inmigrate": + role =3D OCF_SUCCESS + replication =3D OCF_NOT_RUNNING + + elif (vm_status["status"] =3D=3D "running" \ + or vm_status["status"] =3D=3D "colo" \ + or vm_status["status"] =3D=3D "finish-migrate") \ + and colo_status["mode"] =3D=3D "none" \ + and (colo_status["reason"] =3D=3D "request" \ + or colo_status["reason"] =3D=3D "none"): + role =3D OCF_RUNNING_MASTER + replication =3D OCF_NOT_RUNNING + + elif (vm_status["status"] =3D=3D "running" \ + or vm_status["status"] =3D=3D "colo" \ + or vm_status["status"] =3D=3D "finish-migrate") \ + and colo_status["mode"] =3D=3D "secondary": + role =3D OCF_SUCCESS + replication =3D OCF_SUCCESS + + elif (vm_status["status"] =3D=3D "running" \ + or vm_status["status"] =3D=3D "colo" \ + or vm_status["status"] =3D=3D "finish-migrate") \ + and colo_status["mode"] =3D=3D "primary": + role =3D OCF_RUNNING_MASTER + replication =3D OCF_SUCCESS + + else: + log.error("Invalid qemu status:\nvm status: %s\ncolo status: %s" \ + % (vm_status, colo_status)) + role =3D OCF_ERR_GENERIC + replication =3D OCF_ERR_GENERIC + + return role, replication + +# Sanity checks: check parameters, files, binaries, etc. +def qemu_colo_validate_all(): + # Check resource parameters + if not str.isdigit(OCF_RESKEY_base_port): + log.error("base_port needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_checkpoint_interval): + log.error("checkpoint_interval needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_compare_timeout): + log.error("compare_timeout needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_expired_scan_cycle): + log.error("expired_scan_cycle needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_max_disk_errors): + log.error("max_disk_errors needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_monitor_timeout): + log.error("monitor_timeout needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_yank_timeout): + log.error("yank_timeout needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_fail_fast_timeout): + log.error("fail_fast_timeout needs to be a number") + return OCF_ERR_CONFIGURED + + if not str.isdigit(OCF_RESKEY_debug): + log.error("debug needs to be a number") + return OCF_ERR_CONFIGURED + + if not OCF_RESKEY_active_hidden_dir: + log.error("active_hidden_dir needs to be specified") + return OCF_ERR_CONFIGURED + + # Check resource meta configuration + if OCF_ACTION !=3D "stop": + if OCF_RESKEY_CRM_meta_master_max !=3D 1: + log.error("only one master allowed") + return OCF_ERR_CONFIGURED + + if OCF_RESKEY_CRM_meta_clone_max > 2: + log.error("maximum 2 clones allowed") + return OCF_ERR_CONFIGURED + + if OCF_RESKEY_CRM_meta_master_node_max !=3D 1: + log.error("only one master per node allowed") + return OCF_ERR_CONFIGURED + + if OCF_RESKEY_CRM_meta_clone_node_max !=3D 1: + log.error("only one clone per node allowed") + return OCF_ERR_CONFIGURED + + # Check if notify is enabled + if OCF_ACTION !=3D "stop" and OCF_ACTION !=3D "monitor": + if not is_true(OCF_RESKEY_CRM_meta_notify) \ + and not OCF_RESKEY_CRM_meta_notify_start_uname: + log.error("notify needs to be enabled") + return OCF_ERR_CONFIGURED + + # Check that globally-unique is disabled + if is_true(OCF_RESKEY_CRM_meta_globally_unique): + log.error("globally-unique needs to be disabled") + return OCF_ERR_CONFIGURED + + # Check binaries + if not check_binary(OCF_RESKEY_qemu_binary): + return OCF_ERR_INSTALLED + + if not check_binary(OCF_RESKEY_qemu_img_binary): + return OCF_ERR_INSTALLED + + # Check paths and files + if not is_writable(OCF_RESKEY_active_hidden_dir) \ + or not os.path.isdir(OCF_RESKEY_active_hidden_dir): + log.error("active and hidden image directory missing or not writab= le") + return OCF_ERR_PERM + + return OCF_SUCCESS + +# Check if qemu is running +def check_pid(): + if not os.path.exists(PID_FILE): + return OCF_NOT_RUNNING, None + + fd =3D open(PID_FILE, "r") + pid =3D int(str.strip(fd.readline())) + fd.close() + try: + os.kill(pid, 0) + except OSError: + log.info("qemu is not running") + return OCF_NOT_RUNNING, pid + else: + return OCF_SUCCESS, pid + +def qemu_colo_monitor(fail_fast =3D False): + status, pid =3D check_pid() + if status !=3D OCF_SUCCESS: + return status, OCF_NOT_RUNNING + + fd =3D qmp_open(fail_fast) + + role, replication =3D qmp_check_state(fd, fail_fast) + if role !=3D OCF_SUCCESS and role !=3D OCF_RUNNING_MASTER: + return role, replication + + colo_events =3D qmp_execute(fd, [{"exec-helper": "get-events", "argume= nts": {"event": "COLO_EXIT"}}], do_yank =3D False) + for event in colo_events["return"]: + if event["data"]["reason"] =3D=3D "error": + if replication =3D=3D OCF_SUCCESS: + replication =3D OCF_ERR_GENERIC + + if did_yank and replication =3D=3D OCF_SUCCESS: + replication =3D OCF_ERR_GENERIC + + peer_disk_errors =3D 0 + local_disk_errors =3D 0 + quorum_events =3D qmp_execute(fd, [{"exec-helper": "get-events", "argu= ments": {"event": "QUORUM_REPORT_BAD"}}], do_yank =3D False) + for event in quorum_events["return"]: + if event["data"]["node-name"] =3D=3D "nbd0": + if event["data"]["type"] =3D=3D "read": + peer_disk_errors +=3D 1 + else: + peer_disk_errors +=3D int(OCF_RESKEY_max_disk_errors) + else: + if event["data"]["type"] =3D=3D "read": + local_disk_errors +=3D 1 + else: + local_disk_errors +=3D int(OCF_RESKEY_max_disk_errors) + + if int(OCF_RESKEY_max_disk_errors) !=3D 0: + if peer_disk_errors >=3D int(OCF_RESKEY_max_disk_errors): + log.error("Peer disk error") + if replication =3D=3D OCF_SUCCESS: + replication =3D OCF_ERR_GENERIC + + if local_disk_errors >=3D int(OCF_RESKEY_max_disk_errors): + if replication =3D=3D OCF_SUCCESS: + log.error("Local disk error") + role =3D OCF_ERR_GENERIC + else: + log.warning("Local disk error") + + if not fail_fast and OCF_RESKEY_CRM_meta_interval !=3D 0: + # This isn't a probe monitor + block_job =3D qmp_check_resync(fd) + if block_job: + if "error" in block_job: + log.error("resync error: %s" % block_job["error"]) + peer =3D qmp_get_nbd_remote(fd) + qmp_cancel_resync(fd) + report_remote_failure(peer) + elif block_job["ready"] =3D=3D True: + log.info("resync done, starting colo") + peer =3D qmp_get_nbd_remote(fd) + qmp_start_colo(fd, peer) + # COLO started, our secondary now can be promoted if the + # primary fails + set_remote_master_score(peer, 100) + else: + pct_done =3D (float(block_job["offset"]) \ + / float(block_job["len"])) * 100 + log.info("resync %.1f%% done" % pct_done) + else: + if replication =3D=3D OCF_ERR_GENERIC: + if role =3D=3D OCF_RUNNING_MASTER: + log.error("Replication error") + peer =3D qmp_get_nbd_remote(fd) + if peer: + report_remote_failure(peer) + else: + log.warning("Replication error") + qmp_execute(fd, [{"exec-helper": "clear-events"}], do_yank =3D Fal= se) + + fd.close() + + return role, replication + +def qemu_colo_start(): + if check_pid()[0] =3D=3D OCF_SUCCESS: + log.info("qemu is already running") + return OCF_SUCCESS + + rotate_logfile(QMP_LOG, 8) + rotate_logfile(QEMU_LOG, 8) + + run_command(QEMU_DUMMY_CMDLINE) + oob_helper_open() + fd =3D qmp_open() + disk_size =3D qmp_get_disk_size(fd) + fd.close() + _qemu_colo_stop(OCF_SUCCESS, False) + + run_command("'%s' create -q -f qcow2 %s %s" \ + % (OCF_RESKEY_qemu_img_binary, ACTIVE_IMAGE, disk_size)) + run_command("'%s' create -q -f qcow2 %s %s" \ + % (OCF_RESKEY_qemu_img_binary, HIDDEN_IMAGE, disk_size)) + + run_command(QEMU_SECONDARY_CMDLINE) + oob_helper_open() + + fd =3D qmp_open() + qmp_execute(fd, [ + {"execute": "nbd-server-start", "arguments": {"addr": {"type": "in= et", "data": {"host": str(OCF_RESKEY_listen_address), "port": str(NBD_PORT)= }}}}, + {"execute": "nbd-server-add", "arguments": {"device": "parent0", "= writable": True}} + ]) + fd.close() + + return OCF_SUCCESS + +def env_do_shutdown_guest(): + return OCF_RESKEY_CRM_meta_notify_active_uname \ + and OCF_RESKEY_CRM_meta_notify_stop_uname \ + and str.strip(OCF_RESKEY_CRM_meta_notify_active_uname) \ + =3D=3D str.strip(OCF_RESKEY_CRM_meta_notify_stop_uname) + +def env_find_secondary(): + # slave(s) =3D + # OCF_RESKEY_CRM_meta_notify_slave_uname + # - OCF_RESKEY_CRM_meta_notify_stop_uname + # + OCF_RESKEY_CRM_meta_notify_start_uname + # Filter out hosts that are stopping and ourselves + for host in str.split(OCF_RESKEY_CRM_meta_notify_slave_uname, " "): + if host: + for stopping_host \ + in str.split(OCF_RESKEY_CRM_meta_notify_stop_uname, " "): + if host =3D=3D stopping_host: + break + else: + if host !=3D HOSTNAME: + # we found a valid secondary + return host + + for host in str.split(OCF_RESKEY_CRM_meta_notify_start_uname, " "): + if host !=3D HOSTNAME: + # we found a valid secondary + return host + + # we found no secondary + return None + +def _qemu_colo_stop(monstatus, shutdown_guest): + # stop action must do everything possible to stop the resource + try: + timeout =3D START_TIME + (int(OCF_RESKEY_CRM_meta_timeout)/1000) -= 5 + force_stop =3D False + + if monstatus =3D=3D OCF_NOT_RUNNING: + log.info("resource is already stopped") + return OCF_SUCCESS + elif monstatus =3D=3D OCF_RUNNING_MASTER or monstatus =3D=3D OCF_S= UCCESS: + force_stop =3D False + else: + force_stop =3D True + + if not force_stop: + fd =3D qmp_open(True) + if shutdown_guest: + if monstatus =3D=3D OCF_RUNNING_MASTER: + qmp_execute(fd, [{"execute": "system_powerdown"}], \ + do_yank =3D False) + else: + qmp_execute(fd, [{"execute": "quit"}], do_yank =3D False) + fd.close() + + # wait for qemu to stop + while time.time() < timeout: + status, pid =3D check_pid() + if status =3D=3D OCF_NOT_RUNNING: + # qemu stopped + return OCF_SUCCESS + elif status =3D=3D OCF_SUCCESS: + # wait + log.debug("Waiting for qemu to stop") + time.sleep(1) + else: + # something went wrong, force stop instead + break + + log.warning("clean stop timeout reached") + except Exception as e: + log.warning("error while stopping: %s" % e) + + log.info("force stopping qemu") + + status, pid =3D check_pid() + if status =3D=3D OCF_NOT_RUNNING: + return OCF_SUCCESS + try: + if int(OCF_RESKEY_debug) >=3D 2: + os.kill(pid, signal.SIGSEGV) + else: + os.kill(pid, signal.SIGTERM) + time.sleep(2) + os.kill(pid, signal.SIGKILL) + except Exception: + pass + + while check_pid()[0] !=3D OCF_NOT_RUNNING: + time.sleep(1) + + return OCF_SUCCESS + +def qemu_colo_stop(): + shutdown_guest =3D env_do_shutdown_guest() + try: + role, replication =3D qemu_colo_monitor(True) + except Exception: + role, replication =3D OCF_ERR_GENERIC, OCF_ERR_GENERIC + + status =3D _qemu_colo_stop(role, shutdown_guest) + + if HOSTNAME =3D=3D str.strip(OCF_RESKEY_CRM_meta_notify_master_uname): + if str.strip(OCF_RESKEY_CRM_meta_notify_promote_uname) !=3D HOSTNA= ME: + # We where primary and the secondary is to be promoted. + # We are going to be out of date. + set_master_score(0) + else: + if role =3D=3D OCF_RUNNING_MASTER: + # We where a healthy primary but had no healty secondary o= r it + # was stopped as well. So we have up-to-date data. + set_master_score(10) + else: + # We where a unhealthy primary but also had no healty seco= ndary. + # So we still should have up-to-date data. + set_master_score(5) + else: + if get_master_score() > 10: + if role =3D=3D OCF_SUCCESS: + if shutdown_guest: + # We where a healthy secondary and (probably) had a he= althy + # primary and both where stopped. So we have up-to-dat= e data + # too. + set_master_score(10) + else: + # We where a healthy secondary and (probably) had a he= althy + # primary still running. So we are now out of date. + set_master_score(0) + else: + # We where a unhealthy secondary. So we are now out of dat= e. + set_master_score(0) + + return status + +def qemu_colo_notify(): + action =3D "%s-%s" % (OCF_RESKEY_CRM_meta_notify_type, \ + OCF_RESKEY_CRM_meta_notify_operation) + + if action =3D=3D "post-start": + if HOSTNAME =3D=3D str.strip(OCF_RESKEY_CRM_meta_notify_master_una= me): + peer =3D str.strip(OCF_RESKEY_CRM_meta_notify_start_uname) + fd =3D qmp_open() + qmp_start_resync(fd, peer) + # The secondary has inconsistent data until resync is finished + set_remote_master_score(peer, 0) + fd.close() + + elif action =3D=3D "pre-stop": + if not env_do_shutdown_guest() \ + and HOSTNAME =3D=3D str.strip(OCF_RESKEY_CRM_meta_notify_master= _uname) \ + and HOSTNAME !=3D str.strip(OCF_RESKEY_CRM_meta_notify_stop_una= me): + fd =3D qmp_open() + peer =3D qmp_get_nbd_remote(fd) + log.debug("our peer: %s" % peer) + if peer =3D=3D str.strip(OCF_RESKEY_CRM_meta_notify_stop_uname= ): + if qmp_check_resync(fd): + qmp_cancel_resync(fd) + elif get_remote_master_score(peer) > 10: + qmp_primary_failover(fd) + qmp_execute(fd, [{"exec-helper": "clear-events"}],do_yank= =3DFalse) + fd.close() + + elif action =3D=3D "post-stop" \ + and OCF_RESKEY_CRM_meta_notify_key_operation =3D=3D "stonith" \ + and (HOSTNAME =3D=3D str.strip(OCF_RESKEY_CRM_meta_notify_master_= uname) + or str.strip(OCF_RESKEY_CRM_meta_notify_promote_uname)): + peer =3D str.strip(OCF_RESKEY_CRM_meta_notify_stop_uname) + set_remote_master_score(peer, 0) + + return OCF_SUCCESS + +def qemu_colo_promote(): + role, replication =3D qemu_colo_monitor() + + if role =3D=3D OCF_SUCCESS and replication =3D=3D OCF_NOT_RUNNING: + status =3D _qemu_colo_stop(OCF_SUCCESS, False) + if status !=3D OCF_SUCCESS: + return status + + rotate_logfile(QMP_LOG, 8) + rotate_logfile(QEMU_LOG, 8) + run_command(QEMU_PRIMARY_CMDLINE) + oob_helper_open() + set_master_score(101) + + peer =3D env_find_secondary() + if peer: + fd =3D qmp_open() + qmp_start_resync(fd, peer) + # The secondary has inconsistent data until resync is finished + set_remote_master_score(peer, 0) + fd.close() + return OCF_SUCCESS + elif role =3D=3D OCF_SUCCESS and replication !=3D OCF_NOT_RUNNING: + fd =3D qmp_open() + qmp_secondary_failover(fd) + set_master_score(101) + + peer =3D env_find_secondary() + if peer: + qmp_start_resync(fd, peer) + # The secondary has inconsistent data until resync is finished + set_remote_master_score(peer, 0) + qmp_execute(fd, [{"exec-helper": "clear-events"}], do_yank=3DFalse) + fd.close() + return OCF_SUCCESS + else: + return OCF_ERR_GENERIC + +def qemu_colo_demote(): + status =3D qemu_colo_stop() + if status !=3D OCF_SUCCESS: + return status + return qemu_colo_start() + + +if OCF_ACTION =3D=3D "meta-data": + qemu_colo_meta_data() + exit(OCF_SUCCESS) + +logs_open() + +status =3D qemu_colo_validate_all() +# Exit here if our sanity checks fail, but try to continue if we need to s= top +if status !=3D OCF_SUCCESS and OCF_ACTION !=3D "stop": + exit(status) + +setup_constants() + +try: + if OCF_ACTION =3D=3D "start": + status =3D qemu_colo_start() + elif OCF_ACTION =3D=3D "stop": + status =3D qemu_colo_stop() + elif OCF_ACTION =3D=3D "monitor": + status =3D qemu_colo_monitor()[0] + elif OCF_ACTION =3D=3D "notify": + status =3D qemu_colo_notify() + elif OCF_ACTION =3D=3D "promote": + status =3D qemu_colo_promote() + elif OCF_ACTION =3D=3D "demote": + status =3D qemu_colo_demote() + elif OCF_ACTION =3D=3D "validate-all": + status =3D qemu_colo_validate_all() + else: + status =3D OCF_ERR_UNIMPLEMENTED +except Error: + exit(OCF_ERR_GENERIC) +else: + exit(status) -- 2.20.1 --Sig_/11BKVz66ZlFQWJRCkGW5Y9A Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b6+8ACgkQNasLKJxd sljj0xAAiFgB+RHPzbagKnHNDklcwI7FXsAV47G3d/fabKBVUgWIVeQs59GeC/0N GW/T1GyE19OUDhZCvqEGVQ/bO/lOpbr7cgJd5kpAxmM3Xc2hivaIgHOc5kVTnLDp wV/zk+k5y2Sg+caEj01AoAAWAQkQ7pCOuqqvbJ7Yu58Kcapj3VEBoHk1MTC4iKaR AMrvaBOJV25SF3eYGPdRTh31z2a54Luad88Ec1BoXeamj9EjzvaPEMoCDNEHKQeV 0bhhxKSNCZpzxo9/cEBX23Fvyds85/VZ9FQw4qXsOqtpgzmmUAxV8D6EPOboYm90 S4vbynwNP7SjDixXusqrOhvl/qT7kKfmsZtR9pMfEwi+e+tvO2DKf0Ktja5hZ5hT 1A1VxTPXQu0xiWvfSeuZUsex9hDOMA82J+bwtGEYwtiior5gDCwwubJAgPq0rh2b TU59chRsScqJzc8iubmzOW5n789hme4lwLTaFUSVUrmPnODCCi7fPr5UoEQXTA5A iSm1MkvBWV3IIfavEubg1JFFHjTGlzqSfbr5iVa3K0p43d5GMOI99GTLkH+zAN4L bazJkAYs9ZH+Oozbuj6DPJlIogzjGXwvJU1nRf+xazxmHvGakrCVaH8f1wI83Uxr Y9Yt67cy07MqOSq7+hQTOICK7XSt3sqWVXZbRWSVxEjVeMnCX2A= =CScX -----END PGP SIGNATURE----- --Sig_/11BKVz66ZlFQWJRCkGW5Y9A-- From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591472314; cv=none; d=zohomail.com; s=zohoarc; b=Tor1isqARIZqVtJSxq9FkjPTYF15wRd9kXizeYdqYeqFX3d3a8eC6Q3sqeCTBnWbFijZH/Q8As5PufByqqi1Ee4ysfu5l0AbKoakT1nmnS+4MTUlycOhhu+KRnWhPlaQu/iSuFj8sK2Uq3AAF5EKtcUXeOIDBKO9520HoBa4Tmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591472314; h=Content-Type: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=oKGXbRTcUk3+FWJWWqteqps7MUMSBbhpHhs8+JIfpTU=; b=JdaJAPOPUqdKWdtsrn3i5Tll4/iywUxFZH3JsuCj8ogXVtVzU+8KN74osB0ZjbBvi0lwCBLIcizA9eGgOMT8Dsc3F5wL74Np9FQf7X6QGYnGKvkKHV0Tyx4oU8Gn/yEo8uSQ7/4cWs6Yda5EPrltWbzhvpAfvTp428z4SvaUO5w= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591472314605592.5247500071195; Sat, 6 Jun 2020 12:38:34 -0700 (PDT) Received: from localhost ([::1]:35180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheeG-0001XX-S8 for importer@patchew.org; Sat, 06 Jun 2020 15:38:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheLA-0004l7-TC for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:48 -0400 Received: from mout.web.de ([212.227.15.14]:48163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL8-0005fR-Oe for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:48 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MnFy4-1jIBOs0zNU-00jLjJ; Sat, 06 Jun 2020 21:18:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471094; bh=muvZvovkg6UcGXEPPYjfsSD9SOU+34HTnZ1uYKPcPnQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=YDRnSEjZYrBkidVilHOZ6+IoF7dYBkuxU37MieXkWAoq88UA6MxqjpFPuk5cIQHJD 3l7epsouYqG3CvXSAZrBHYBI/4z1dW22c8pkiAL2N3KlvCZJkBx6niuDicMSkabD/X gFhbtk27Hspju3PX2Ve2+IxnIF9LGiwcJ3+q6cmA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:18:12 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 5/7] colo: Introduce high-level test suite Message-ID: <33bf63ff0abd6afa93d2d2afb9dfca507ddf534a.1591456338.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/15CcQVBe8TC9A4Loe/EjdQa"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:vErOHF2nmkmLtb8p32WMy0xM0wFUUj4t2wZzxR2BgZxp8tXQFRL hwbgcrqqTW/nKwGje27GHhuEqjiIPUVNaqfgmgAGxbCAJNelRTtYBfiG0omd+ieDLZOSsEl MfMhRGcQnOJkJ43Npa4wTyDidF3QlroEDH0TYLZwIFgdukwXtyb5RsQdnNyCfLRoiXw9I3y BPtQ/MuRAD2Sny3Juw+Tw== X-UI-Out-Filterresults: notjunk:1;V03:K0:3wcD3BKhKyg=:q64kWAme0DTiYFeJ8Kvyua eaBmW8j0kIs7p2u38RErV/7tUfLYMFxk9ypggwx7n0zNv1mGFPIpzCP1RgNJ7yDop1J2yHueL 4jUQtJ6abOBHp8QwbE7Y4fuWkRQ1P4r0qBYcmEiEu7ohZKJj739jhm/QzXwor1TrMJEOiCI75 XbckyOYpxoRC1bO1eHI6TvTWZXNdZ8LQsH0EoJ+fpwERUmQqjhdUydLspegZKNsXvhd49ukrx xuv3Li+FeeOSGmYmYJGMJALsLVeL9k1ReekGxA/q0fiOpq1Y4+LDEJi3n7yPoBOUpkePoVaX2 wz3EVmlqgea3tn68vAL7xYndhDKFTyIVdgQyvkfYsRqJsYV5D9az0MwRII/yuK+dNHTZghNVL oowAWj+gO3jUVvWUtlky+EiPQuRc/PrginjT8eDF2UzfOynS4Lnry60J2wFk56miW/n6CdsWt tCFOpLJO4yfAVHzFfNHViDB6xxHdd+I2AjuWdVFsfuGSGqxHmdnevlojQDXoVJ5fuk/mOvf1O L1GU7+CSyzhha15qctjqOQM4tzwYf4HSdkVsGeXtUvbVUHciNHfWBKwWQHiOMi7P4iPCzMvqs pLNZ/DYstb7as03+tu961sLWAmxRK5O8gN7LLX1eceogmcmoTEiV84lIaN8TPhaT3aYwBdefJ ZlTo5zv/CAKJjDaKEkW380YK3axLGtt0SMZsMvih7yLlcUrxCuTbaTB7GtVhzeks4aBkvcO8S FV04TIfI76atRKueNXTSq2cmnr95oleUkkcZ90OYKgwAVIgeypUv7BYQyOd5fOZG6dbR1Sfv2 N1FMgAy1hBuJCmVnlQPfBehDOBTA8gAbYEJoaY1SAmRYwQh+2Gx7/1eNriuBZB3aTNgBxto6z A28ikufqbnbTn5KzAuQUIUCdwYSzlFp9gmI+wK5Qk0EUZQ82mdLLcc7gQZ2cu0UGrWHTP5K2y JCLWUWsDYg6dhl8ZdzrP4UHRs+5qpgH3WVHW7mklta4c6jAgPxOkm3/o2zwF8NsFTaUf04Hpy 1R1cBVXMbu8AvHgQ3bEKV7WbOioNEsqPP9bD3iSezZBKsd6l9QnU/kikqzWTH3vg14aEh+IEW Eyu1cVXMir7uRjWnM9PAn9u9oKad177kVkNPQQFnBIP6n6W37OSGF3Y7z/FEEUqPhHz7C516k L/fTZE649pRqn4yatl4tWYp/w3u8I0HznhXy1BZ8mNSFnLlyq+QQmOqDmfJeddiJvN5tw966e TTmd5egJ7gyTgHyhU 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=212.227.15.14; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/15CcQVBe8TC9A4Loe/EjdQa Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add high-level test relying on the colo resource-agent to test all failover cases while checking guest network connectivity. Signed-off-by: Lukas Straub --- scripts/colo-resource-agent/crm_master | 44 ++ scripts/colo-resource-agent/crm_resource | 12 + tests/acceptance/colo.py | 677 +++++++++++++++++++++++ 3 files changed, 733 insertions(+) create mode 100755 scripts/colo-resource-agent/crm_master create mode 100755 scripts/colo-resource-agent/crm_resource create mode 100644 tests/acceptance/colo.py diff --git a/scripts/colo-resource-agent/crm_master b/scripts/colo-resource= -agent/crm_master new file mode 100755 index 0000000000..886f523bda --- /dev/null +++ b/scripts/colo-resource-agent/crm_master @@ -0,0 +1,44 @@ +#!/bin/bash + +# Fake crm_master for COLO testing +# +# Copyright (c) Lukas Straub +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +TMPDIR=3D"$HA_RSCTMP" +score=3D0 +query=3D0 + +OPTIND=3D1 +while getopts 'Qql:Dv:N:G' opt; do + case "$opt" in + Q|q) + # Noop + ;; + "l") + # Noop + ;; + "D") + score=3D0 + ;; + "v") + score=3D$OPTARG + ;; + "N") + TMPDIR=3D"$COLO_TEST_REMOTE_TMP" + ;; + "G") + query=3D1 + ;; + esac +done + +if (( query )); then + cat "${TMPDIR}/master_score" || exit 1 +else + echo $score > "${TMPDIR}/master_score" || exit 1 +fi + +exit 0 diff --git a/scripts/colo-resource-agent/crm_resource b/scripts/colo-resour= ce-agent/crm_resource new file mode 100755 index 0000000000..ad69ff3c6b --- /dev/null +++ b/scripts/colo-resource-agent/crm_resource @@ -0,0 +1,12 @@ +#!/bin/sh + +# Fake crm_resource for COLO testing +# +# Copyright (c) Lukas Straub +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +# Noop + +exit 0 diff --git a/tests/acceptance/colo.py b/tests/acceptance/colo.py new file mode 100644 index 0000000000..40a88d9b72 --- /dev/null +++ b/tests/acceptance/colo.py @@ -0,0 +1,677 @@ +# High-level test suite for qemu COLO testing all failover cases while che= cking +# guest network connectivity +# +# Copyright (c) Lukas Straub +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +# HOWTO: +# +# This test has the following parameters: +# bridge_name: name of the bridge interface to connect qemu to +# host_address: ip address of the bridge interface +# guest_address: ip address that the guest gets from the dhcp server +# bridge_helper: path to the brige helper +# (default: /usr/lib/qemu/qemu-bridge-helper) +# install_cmd: command to run to install iperf3 and memtester in the guest +# (default: "sudo -n dnf -q -y install iperf3 memtester") +# +# To run the network tests, you have to specify the parameters. +# +# Example for running the colo tests: +# make check-acceptance FEDORA_31_ARCHES=3D"x86_64" AVOCADO_TAGS=3D"-t col= o \ +# -p bridge_name=3Dbr0 -p host_address=3D192.168.220.1 \ +# -p guest_address=3D192.168.220.222" +# +# The colo tests currently only use x86_64 test vm images. With the +# FEDORA_31_ARCHES make variable as in the example, only the x86_64 images= will +# be downloaded. +# +# If you're running the network tests as an unprivileged user, you need to= set +# the suid bit on the bridge helper (chmod +s ). +# +# The dhcp server should assign a static ip to the guest, else the test ma= y be +# unreliable. The Mac address for the guest is always 52:54:00:12:34:56. + + +import sys +import subprocess +import shutil +import os +import signal +import os.path +import time +import tempfile + +from avocado import skipUnless +from avocado.utils import network +from avocado.utils import vmimage +from avocado.utils import cloudinit +from avocado.utils import ssh +from avocado.utils.path import find_command + +from avocado_qemu import Test, pick_default_qemu_bin, SOURCE_DIR +from qemu.qmp import QEMUMonitorProtocol + +def iperf3_available(): + try: + find_command("iperf3") + except CmdNotFoundError: + return False + return True + +class ColoTest(Test): + + # Constants + OCF_SUCCESS =3D 0 + OCF_ERR_GENERIC =3D 1 + OCF_ERR_ARGS =3D 2 + OCF_ERR_UNIMPLEMENTED =3D 3 + OCF_ERR_PERM =3D 4 + OCF_ERR_INSTALLED =3D 5 + OCF_ERR_CONFIGURED =3D 6 + OCF_NOT_RUNNING =3D 7 + OCF_RUNNING_MASTER =3D 8 + OCF_FAILED_MASTER =3D 9 + + HOSTA =3D 10 + HOSTB =3D 11 + + QEMU_OPTIONS =3D (" -display none -vga none -enable-kvm" + " -smp 2 -cpu host -m 768" + " -device e1000,mac=3D52:54:00:12:34:56,netdev=3Dhn0" + " -device virtio-blk,drive=3Dcolo-disk0") + + FEDORA_VERSION =3D "31" + IMAGE_CHECKSUM =3D "e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc0= 26954f3c5c27a0" + + hang_qemu =3D False + checkpoint_failover =3D False + traffic_procs =3D [] + + def get_image(self, temp_dir): + try: + return vmimage.get( + "fedora", arch=3D"x86_64", version=3Dself.FEDORA_VERSION, + checksum=3Dself.IMAGE_CHECKSUM, algorithm=3D"sha256", + cache_dir=3Dself.cache_dirs[0], + snapshot_dir=3Dtemp_dir) + except: + self.cancel("Failed to download/prepare image") + + @skipUnless(ssh.SSH_CLIENT_BINARY, "No SSH client available") + def setUp(self): + # Qemu and qemu-img binary + default_qemu_bin =3D pick_default_qemu_bin() + self.QEMU_BINARY =3D self.params.get("qemu_bin", default=3Ddefault= _qemu_bin) + + qemu_img =3D self.pick_qemu_util("qemu-img") + self.QEMU_IMG_BINARY =3D qemu_img + vmimage.QEMU_IMG =3D qemu_img + + self.RESOURCE_AGENT =3D os.path.join(SOURCE_DIR, + "scripts/colo-resource-agent/co= lo") + self.ADD_PATH =3D os.path.join(SOURCE_DIR, "scripts/colo-resource-= agent") + + # Logs + self.RA_LOG =3D os.path.join(self.outputdir, "resource-agent.log") + self.HOSTA_LOGDIR =3D os.path.join(self.outputdir, "hosta") + self.HOSTB_LOGDIR =3D os.path.join(self.outputdir, "hostb") + os.makedirs(self.HOSTA_LOGDIR) + os.makedirs(self.HOSTB_LOGDIR) + + # Temporary directories + # We don't use self.workdir because of unix socket path length + # limitations + self.TMPDIR =3D tempfile.mkdtemp() + self.TMPA =3D os.path.join(self.TMPDIR, "hosta") + self.TMPB =3D os.path.join(self.TMPDIR, "hostb") + os.makedirs(self.TMPA) + os.makedirs(self.TMPB) + + # Network + self.BRIDGE_NAME =3D self.params.get("bridge_name") + if self.BRIDGE_NAME: + self.HOST_ADDRESS =3D self.params.get("host_address") + self.GUEST_ADDRESS =3D self.params.get("guest_address") + self.BRIDGE_HELPER =3D self.pick_qemu_util("qemu-bridge-helper= ") + self.SSH_PORT =3D 22 + else: + # QEMU's hard coded usermode router address + self.HOST_ADDRESS =3D "10.0.2.2" + self.GUEST_ADDRESS =3D "127.0.0.1" + self.BRIDGE_HOSTA_PORT =3D network.find_free_port(address=3D"1= 27.0.0.1") + self.BRIDGE_HOSTB_PORT =3D network.find_free_port(address=3D"1= 27.0.0.1") + self.SSH_PORT =3D network.find_free_port(address=3D"127.0.0.1") + + self.CLOUDINIT_HOME_PORT =3D network.find_free_port() + + # Find free port range + base_port =3D 1024 + while True: + base_port =3D network.find_free_port(start_port=3Dbase_port, + address=3D"127.0.0.1") + if base_port =3D=3D None: + self.cancel("Failed to find a free port") + for n in range(base_port, base_port +4): + if n > 65535: + break + if not network.is_port_free(n, "127.0.0.1"): + break + else: + # for loop above didn't break + break + + self.BASE_PORT =3D base_port + + # Disk images + self.log.info("Downloading/preparing boot image") + self.HOSTA_IMAGE =3D self.get_image(self.TMPA).path + self.HOSTB_IMAGE =3D self.get_image(self.TMPB).path + self.CLOUDINIT_ISO =3D os.path.join(self.TMPDIR, "cloudinit.iso") + + self.log.info("Preparing cloudinit image") + try: + cloudinit.iso(self.CLOUDINIT_ISO, self.name, + username=3D"test", password=3D"password", + phone_home_host=3Dself.HOST_ADDRESS, + phone_home_port=3Dself.CLOUDINIT_HOME_PORT) + except Exception as e: + self.cancel("Failed to prepare cloudinit image") + + self.QEMU_OPTIONS +=3D " -cdrom %s" % self.CLOUDINIT_ISO + + # Network bridge + if not self.BRIDGE_NAME: + self.BRIDGE_PIDFILE =3D os.path.join(self.TMPDIR, "bridge.pid") + self.run_command(("'%s' -pidfile '%s'" + " -M none -display none -daemonize" + " -netdev user,id=3Dhost,hostfwd=3Dtcp:127.0.0.1:%s-:22" + " -netdev socket,id=3Dhosta,listen=3D127.0.0.1:%s" + " -netdev socket,id=3Dhostb,listen=3D127.0.0.1:%s" + " -netdev hubport,id=3Dhostport,hubid=3D0,netdev=3Dhost" + " -netdev hubport,id=3Dporta,hubid=3D0,netdev=3Dhosta" + " -netdev hubport,id=3Dportb,hubid=3D0,netdev=3Dhostb") + % (self.QEMU_BINARY, self.BRIDGE_PIDFILE, self.SSH_PORT, + self.BRIDGE_HOSTA_PORT, self.BRIDGE_HOSTB_PORT), 0) + + def tearDown(self): + try: + pid =3D self.read_pidfile(self.BRIDGE_PIDFILE) + if pid and self.check_pid(pid): + os.kill(pid, signal.SIGKILL) + except Exception as e: + pass + + try: + self.ra_stop(self.HOSTA) + except Exception as e: + pass + + try: + self.ra_stop(self.HOSTB) + except Exception as e: + pass + + try: + self.ssh_close() + except Exception as e: + pass + + for proc in self.traffic_procs: + try: + os.killpg(proc.pid, signal.SIGTERM) + except Exception as e: + pass + + shutil.rmtree(self.TMPDIR) + + def run_command(self, cmdline, expected_status, env=3DNone): + proc =3D subprocess.Popen(cmdline, shell=3DTrue, stdout=3Dsubproce= ss.PIPE, + stderr=3Dsubprocess.STDOUT, + universal_newlines=3DTrue, env=3Denv) + stdout, stderr =3D proc.communicate() + if proc.returncode !=3D expected_status: + self.fail("command \"%s\" failed with code %s:\n%s" + % (cmdline, proc.returncode, stdout)) + + return proc.returncode + + def cat_line(self, path): + line=3D"" + try: + fd =3D open(path, "r") + line =3D str.strip(fd.readline()) + fd.close() + except: + pass + return line + + def read_pidfile(self, pidfile): + try: + pid =3D int(self.cat_line(pidfile)) + except ValueError: + return None + else: + return pid + + def check_pid(self, pid): + try: + os.kill(pid, 0) + except OSError: + return False + else: + return True + + def ssh_open(self): + self.ssh_conn =3D ssh.Session(self.GUEST_ADDRESS, self.SSH_PORT, + user=3D"test", password=3D"password") + self.ssh_conn.DEFAULT_OPTIONS +=3D (("UserKnownHostsFile", "/dev/n= ull"),) + for i in range(10): + try: + if self.ssh_conn.connect(): + return + except Exception as e: + pass + time.sleep(4) + self.fail("sshd timeout") + + def ssh_ping(self): + if self.ssh_conn.cmd("echo ping").stdout !=3D b"ping\n": + self.fail("ssh ping failed") + + def ssh_close(self): + self.ssh_conn.quit() + + def setup_base_env(self, host): + PATH =3D os.getenv("PATH", "") + env =3D { "PATH": "%s:%s" % (self.ADD_PATH, PATH), + "HA_LOGFILE": self.RA_LOG, + "OCF_RESOURCE_INSTANCE": "colo-test", + "OCF_RESKEY_CRM_meta_clone_max": "2", + "OCF_RESKEY_CRM_meta_notify": "true", + "OCF_RESKEY_CRM_meta_timeout": "30000", + "OCF_RESKEY_qemu_binary": self.QEMU_BINARY, + "OCF_RESKEY_qemu_img_binary": self.QEMU_IMG_BINARY, + "OCF_RESKEY_checkpoint_interval": "10000", + "OCF_RESKEY_base_port": str(self.BASE_PORT), + "OCF_RESKEY_debug": "2"} + + if host =3D=3D self.HOSTA: + env.update({"OCF_RESKEY_options": + ("%s -qmp unix:%s,server,nowait" + " -drive if=3Dnone,node-name=3Dparent0,file= =3D'%s'") + % (self.QEMU_OPTIONS, self.get_qmp_sock(host), + self.HOSTA_IMAGE), + "OCF_RESKEY_active_hidden_dir": self.TMPA, + "OCF_RESKEY_listen_address": "127.0.0.1", + "OCF_RESKEY_log_dir": self.HOSTA_LOGDIR, + "OCF_RESKEY_CRM_meta_on_node": "127.0.0.1", + "HA_RSCTMP": self.TMPA, + "COLO_TEST_REMOTE_TMP": self.TMPB}) + + else: + env.update({"OCF_RESKEY_options": + ("%s -qmp unix:%s,server,nowait" + " -drive if=3Dnone,node-name=3Dparent0,file= =3D'%s'") + % (self.QEMU_OPTIONS, self.get_qmp_sock(host), + self.HOSTB_IMAGE), + "OCF_RESKEY_active_hidden_dir": self.TMPB, + "OCF_RESKEY_listen_address": "127.0.0.2", + "OCF_RESKEY_log_dir": self.HOSTB_LOGDIR, + "OCF_RESKEY_CRM_meta_on_node": "127.0.0.2", + "HA_RSCTMP": self.TMPB, + "COLO_TEST_REMOTE_TMP": self.TMPA}) + + if self.BRIDGE_NAME: + env["OCF_RESKEY_options"] +=3D \ + " -netdev bridge,id=3Dhn0,br=3D%s,helper=3D'%s'" \ + % (self.BRIDGE_NAME, self.BRIDGE_HELPER) + else: + if host =3D=3D self.HOSTA: + env["OCF_RESKEY_options"] +=3D \ + " -netdev socket,id=3Dhn0,connect=3D127.0.0.1:%s" \ + % self.BRIDGE_HOSTA_PORT + else: + env["OCF_RESKEY_options"] +=3D \ + " -netdev socket,id=3Dhn0,connect=3D127.0.0.1:%s" \ + % self.BRIDGE_HOSTB_PORT + return env + + def ra_start(self, host): + env =3D self.setup_base_env(host) + self.run_command(self.RESOURCE_AGENT + " start", self.OCF_SUCCESS,= env) + + def ra_stop(self, host): + env =3D self.setup_base_env(host) + self.run_command(self.RESOURCE_AGENT + " stop", self.OCF_SUCCESS, = env) + + def ra_monitor(self, host, expected_status): + env =3D self.setup_base_env(host) + self.run_command(self.RESOURCE_AGENT + " monitor", expected_status= , env) + + def ra_promote(self, host): + env =3D self.setup_base_env(host) + self.run_command(self.RESOURCE_AGENT + " promote", self.OCF_SUCCES= S,env) + + def ra_notify_start(self, host): + env =3D self.setup_base_env(host) + + env.update({"OCF_RESKEY_CRM_meta_notify_type": "post", + "OCF_RESKEY_CRM_meta_notify_operation": "start"}) + + if host =3D=3D self.HOSTA: + env.update({"OCF_RESKEY_CRM_meta_notify_master_uname": "127.0.= 0.1", + "OCF_RESKEY_CRM_meta_notify_start_uname": "127.0.0= .2"}) + else: + env.update({"OCF_RESKEY_CRM_meta_notify_master_uname": "127.0.= 0.2", + "OCF_RESKEY_CRM_meta_notify_start_uname": "127.0.0= .1"}) + + self.run_command(self.RESOURCE_AGENT + " notify", self.OCF_SUCCESS= , env) + + def ra_notify_stop(self, host): + env =3D self.setup_base_env(host) + + env.update({"OCF_RESKEY_CRM_meta_notify_type": "pre", + "OCF_RESKEY_CRM_meta_notify_operation": "stop"}) + + if host =3D=3D self.HOSTA: + env.update({"OCF_RESKEY_CRM_meta_notify_master_uname": "127.0.= 0.1", + "OCF_RESKEY_CRM_meta_notify_stop_uname": "127.0.0.= 2"}) + else: + env.update({"OCF_RESKEY_CRM_meta_notify_master_uname": "127.0.= 0.2", + "OCF_RESKEY_CRM_meta_notify_stop_uname": "127.0.0.= 1"}) + + self.run_command(self.RESOURCE_AGENT + " notify", self.OCF_SUCCESS= , env) + + def get_pid(self, host): + if host =3D=3D self.HOSTA: + return self.read_pidfile(os.path.join(self.TMPA, + "colo-test-qemu.pid")) + else: + return self.read_pidfile(os.path.join(self.TMPB, + "colo-test-qemu.pid")) + + def get_master_score(self, host): + if host =3D=3D self.HOSTA: + return int(self.cat_line(os.path.join(self.TMPA, "master_score= "))) + else: + return int(self.cat_line(os.path.join(self.TMPB, "master_score= "))) + + def get_qmp_sock(self, host): + if host =3D=3D self.HOSTA: + return os.path.join(self.TMPA, "my-qmp.sock") + else: + return os.path.join(self.TMPB, "my-qmp.sock") + + + def kill_qemu_pre(self, host): + pid =3D self.get_pid(host) + + qmp_sock =3D self.get_qmp_sock(host) + + if self.checkpoint_failover: + qmp_conn =3D QEMUMonitorProtocol(qmp_sock) + qmp_conn.settimeout(10) + qmp_conn.connect() + while True: + event =3D qmp_conn.pull_event(wait=3DTrue) + if event["event"] =3D=3D "STOP": + break + qmp_conn.close() + + + if pid and self.check_pid(pid): + if self.hang_qemu: + os.kill(pid, signal.SIGSTOP) + else: + os.kill(pid, signal.SIGKILL) + while self.check_pid(pid): + time.sleep(1) + + def kill_qemu_post(self, host): + pid =3D self.get_pid(host) + + if self.hang_qemu and pid and self.check_pid(pid): + os.kill(pid, signal.SIGKILL) + while self.check_pid(pid): + time.sleep(1) + + def prepare_guest(self): + pass + + def cycle_start(self, cycle): + pass + + def active_section(self): + return False + + def cycle_end(self, cycle): + pass + + def check_connection(self): + self.ssh_ping() + for proc in self.traffic_procs: + if proc.poll() !=3D None: + self.fail("Traffic process died") + + def _test_colo(self, loop=3D1): + loop =3D max(loop, 1) + self.log.info("Will put logs in %s" % self.outputdir) + + self.ra_stop(self.HOSTA) + self.ra_stop(self.HOSTB) + + self.log.info("*** Startup ***") + self.ra_start(self.HOSTA) + self.ra_start(self.HOSTB) + + self.ra_monitor(self.HOSTA, self.OCF_SUCCESS) + self.ra_monitor(self.HOSTB, self.OCF_SUCCESS) + + self.log.info("*** Promoting ***") + self.ra_promote(self.HOSTA) + cloudinit.wait_for_phone_home(("0.0.0.0", self.CLOUDINIT_HOME_PORT= ), + self.name) + self.ssh_open() + self.prepare_guest() + + self.ra_notify_start(self.HOSTA) + + while self.get_master_score(self.HOSTB) !=3D 100: + self.ra_monitor(self.HOSTA, self.OCF_RUNNING_MASTER) + self.ra_monitor(self.HOSTB, self.OCF_SUCCESS) + time.sleep(1) + + self.log.info("*** Replication started ***") + + self.check_connection() + + primary =3D self.HOSTA + secondary =3D self.HOSTB + + for n in range(loop): + self.cycle_start(n) + self.log.info("*** Secondary failover ***") + self.kill_qemu_pre(primary) + self.ra_notify_stop(secondary) + self.ra_monitor(secondary, self.OCF_SUCCESS) + self.ra_promote(secondary) + self.ra_monitor(secondary, self.OCF_RUNNING_MASTER) + self.kill_qemu_post(primary) + + self.check_connection() + + tmp =3D primary + primary =3D secondary + secondary =3D tmp + + self.log.info("*** Secondary continue replication ***") + self.ra_start(secondary) + self.ra_notify_start(primary) + + self.check_connection() + + # Wait for resync + while self.get_master_score(secondary) !=3D 100: + self.ra_monitor(primary, self.OCF_RUNNING_MASTER) + self.ra_monitor(secondary, self.OCF_SUCCESS) + time.sleep(1) + + self.log.info("*** Replication started ***") + + self.check_connection() + + if self.active_section(): + break + + self.log.info("*** Primary failover ***") + self.kill_qemu_pre(secondary) + self.ra_monitor(primary, self.OCF_RUNNING_MASTER) + self.ra_notify_stop(primary) + self.ra_monitor(primary, self.OCF_RUNNING_MASTER) + self.kill_qemu_post(secondary) + + self.check_connection() + + self.log.info("*** Primary continue replication ***") + self.ra_start(secondary) + self.ra_notify_start(primary) + + self.check_connection() + + # Wait for resync + while self.get_master_score(secondary) !=3D 100: + self.ra_monitor(primary, self.OCF_RUNNING_MASTER) + self.ra_monitor(secondary, self.OCF_SUCCESS) + time.sleep(1) + + self.log.info("*** Replication started ***") + + self.check_connection() + + self.cycle_end(n) + + self.ssh_close() + + self.ra_stop(self.HOSTA) + self.ra_stop(self.HOSTB) + + self.ra_monitor(self.HOSTA, self.OCF_NOT_RUNNING) + self.ra_monitor(self.HOSTB, self.OCF_NOT_RUNNING) + self.log.info("*** all ok ***") + + +class ColoQuickTest(ColoTest): + """ + :avocado: tags=3Dcolo + :avocado: tags=3Dquick + :avocado: tags=3Darch:x86_64 + """ + + timeout =3D 300 + + def cycle_end(self, cycle): + self.log.info("Testing with peer qemu hanging" + " and failover during checkpoint") + self.hang_qemu =3D True + + def test_quick(self): + self.checkpoint_failover =3D True + self.log.info("Testing with peer qemu crashing" + " and failover during checkpoint") + self._test_colo(loop=3D2) + + +class ColoNetworkTest(ColoTest): + + def prepare_guest(self): + install_cmd =3D self.params.get("install_cmd", default=3D + "sudo -n dnf -q -y install iperf3 memteste= r") + self.ssh_conn.cmd(install_cmd) + # Use two instances to work around a bug in iperf3 + self.ssh_conn.cmd("iperf3 -sD; iperf3 -sD -p 5202") + + def _cycle_start(self, cycle): + pass + + def cycle_start(self, cycle): + self._cycle_start(cycle) + tests =3D [("", "client-to-server tcp"), ("-R", "server-to-client = tcp")] + + self.log.info("Testing iperf %s" % tests[cycle % 2][1]) + iperf_cmd =3D "iperf3 %s -t 60 -i 60 --connect-timeout 30000 -c %s= " \ + % (tests[cycle % 2][0], self.GUEST_ADDRESS) + proc =3D subprocess.Popen("while %s && %s; do sleep 1; done >>'%s'= 2>&1" + % (iperf_cmd, iperf_cmd + " -p 5202", + os.path.join(self.outputdir, "iperf.log")), + shell=3DTrue, preexec_fn=3Dos.setsid, stdin=3Dsubproce= ss.DEVNULL, + stdout=3Dsubprocess.DEVNULL, stderr=3Dsubprocess.DEVNU= LL) + self.traffic_procs.append(proc) + time.sleep(5) # Wait for iperf to get up to speed + + def cycle_end(self, cycle): + for proc in self.traffic_procs: + try: + os.killpg(proc.pid, signal.SIGTERM) + proc.wait() + except Exception as e: + pass + self.traffic_procs.clear() + time.sleep(20) + +class ColoRealNetworkTest(ColoNetworkTest): + """ + :avocado: tags=3Dcolo + :avocado: tags=3Dslow + :avocado: tags=3Dnetwork_test + :avocado: tags=3Darch:x86_64 + """ + + timeout =3D 900 + + def active_section(self): + time.sleep(300) + return False + + @skipUnless(iperf3_available(), "iperf3 not available") + def test_network(self): + if not self.BRIDGE_NAME: + self.cancel("bridge options not given, will skip network test") + self.log.info("Testing with peer qemu crashing and network load") + self._test_colo(loop=3D2) + +class ColoStressTest(ColoNetworkTest): + """ + :avocado: tags=3Dcolo + :avocado: tags=3Dslow + :avocado: tags=3Dstress_test + :avocado: tags=3Darch:x86_64 + """ + + timeout =3D 1800 + + def _cycle_start(self, cycle): + if cycle =3D=3D 4: + self.log.info("Stresstest with peer qemu hanging, network load" + " and failover during checkpoint") + self.checkpoint_failover =3D True + self.hang_qemu =3D True + elif cycle =3D=3D 8: + self.log.info("Stresstest with peer qemu crashing and network = load") + self.checkpoint_failover =3D False + self.hang_qemu =3D False + elif cycle =3D=3D 12: + self.log.info("Stresstest with peer qemu hanging and network l= oad") + self.checkpoint_failover =3D False + self.hang_qemu =3D True + + @skipUnless(iperf3_available(), "iperf3 not available") + def test_stress(self): + if not self.BRIDGE_NAME: + self.cancel("bridge options not given, will skip network test") + self.log.info("Stresstest with peer qemu crashing, network load" + " and failover during checkpoint") + self.checkpoint_failover =3D True + self._test_colo(loop=3D16) -- 2.20.1 --Sig_/15CcQVBe8TC9A4Loe/EjdQa Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b6/QACgkQNasLKJxd slgXBQ//U6pPWiyNAztq7CdbxGHocVD8STbC0jl9xxqdD+qQWgrXT9+dbwIbaJoK BoGIz0sAQdBLEHGH2T06fCP3QeMVoBI/854xa85vlUT+UnVGIgJas0Y3Fl1RJNAQ gJuZ1NXNxpxLeBtLmlJwc84JwQID5a4BV30pIPbbpCy0GUL+yvIUflWdb4daA1oX xTw62uSUQfzEUzQWsNC1uno9AjBeQc2ce17D4NXpsN1/Y+JlSbXJBs/Q3DYMkIwy Bg1ftAjyHUM1RnMRZmdquAzF/WsLT6FrUU5jnrDsUFMLXtQbXc4rtekUrqRgiqFY VPY9WEG1zfmCdO2CJohElRbR7vuzGXPuGTbHTpKt3jpNp1uZ2Bm05iHtkPX1I2Rj 2pzQnKe+/hrO4Jwuod9SdLQq3fFLID/X3NoDnRaQ8Vu/Jm74so8cf+DIkc1SvHZF 2Kj3cvtx5NMjf0wR+RUPLdWUu55Hido6mBi+HQM1Y5Q6sgyrG/gM9T3u2AbvKSkB wfJTiNejM4Tho7oHjPwmRWGzx9VB2BErvq146fYcV3JPI9vJX/5TPY8hzEKU/nmC ypnxhWrAxlxhL0POKUh0MoPpwnZmT6IPSj/KH044UxSpyWxThnWJ5ezwNHg7mFlE qg9GsOdkXZLpz3qoEUV+NqEmy+Jg5aunVmmIe9r3gsO/TiZQqhU= =027m -----END PGP SIGNATURE----- --Sig_/15CcQVBe8TC9A4Loe/EjdQa-- From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591471999; cv=none; d=zohomail.com; s=zohoarc; b=Hl6SJoNDrPjk0FSlJ6ffpXbZsuZjl7VYX8QgFTuZEHIEmMKpGBJyuDlRz8KtAxzRQQyIl8CHdAoczkicAFg2A6x6/3k9p9tr3SHSvnFNfFJsZ3L1gPqQgW/7OBdFgM+NapJeE1H17CZPZM4GcZD9pHvuJgXM7dLGyarDwVcuoKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591471999; h=Content-Type: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=ccQndkiRsPjv+3tWWXRkzNpakpJgqf4ZwDNmhWVRLb8=; b=faZ958+Bh40N7L6wc/bQ/y4DKlRv4KZeQGzCdeC6mRXb7o3lx3BwRw3WpyoanAO3AsPBI3uVI+c3w89SXf/Wg1mIdvBs3owamVb1cRiz4dR4r9Ae4Pjl3RBYPHJgFT/e56KUDdxX4wKYVr2MKV+2sFLTC74myKoDeeygg87s2Yc= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591471999099668.3156288611499; Sat, 6 Jun 2020 12:33:19 -0700 (PDT) Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheZB-0006pa-Kz for importer@patchew.org; Sat, 06 Jun 2020 15:33:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL8-0004hq-V8 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:46 -0400 Received: from mout.web.de ([212.227.17.12]:57427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL7-0005do-No for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:46 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M57Vi-1ikbgt1x42-00zFj1; Sat, 06 Jun 2020 21:18:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471097; bh=M2wUbERBYXkG9+JKl52v0XU9Jkn+Ar+DrSWBvHw2TRs=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=F1VWM23HU3KMePOYdou/mvm4D44+ZR1wLRyk9F1jz5gxR5yBmieMsAyrSrQBvtTSp LDlBY6KsArpAbUvEDyyQfneGdYnxZx5SRS0IAu0YWcrVq/dHk8RMG4C+c7ZUf6tBmA +w4SWlPXA0HCdXhRwQgBohsC/iG667zagQO1lTIc= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:18:16 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 6/7] configure,Makefile: Install colo resource-agent Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/C6NBoAG9r4uHDmHjzHFIVx0"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:O1sxOPo1cfXbWRMsgDzY+tHhX+15cbpW1Gp4bUWbhdG3VuFw6RC JFQpLwydxvmbHUi5NWaa/nt9f/wV3CmjBhGSo4ASUSz3Q+IMfkSDxvDS4rEBnReb/YHalLy vFanEkyb2CHwqxaJH6/T6aVM9KJuZ8TpPZbwXKoqVVu3Add9BTzOraPV53CO7U7uvOJE9Xt VhlKuCJBq3wIiVmcuvhqw== X-UI-Out-Filterresults: notjunk:1;V03:K0:7FYAYU9faS0=:pV857PrqQavR9e5dxCZhcT NFREqDqqK7ZB7zvZdjwbYSl+Ib8iwqofSGyF9Vt+tAjByV5tkRfwhXdSoALIYS5n826rjT4Jt aqxOtOgEILlRvgyKxQVvWAfnE9pNyvFl4KwANzhPhpWj+s7xRWCUCDSsxA4xiWQJuKNBj9aA0 6sAsmORWsITO/wB7hq1V6mbI6IY1eFCKCvnuk7+aDe8dXjKFeeWmwbat/BkSWN8OyWGoqoHVE H/5jEzsm+EHs6+BSERohAIJgWvg+F6bHXrL1BjOpb5cf38f7sQ0yewhZvSqSn43nnAfrFf7o/ wzdIrh/F4OnLK29faLx1fV9kmkSexzOlRnhrOq5zb3Qm1Ursq9/iN9CeKms8nbb36Pytx8le3 miKdk5IUNxG78NhUTOKadYl9dw1Juu2mLMezZyBq+pRRdIJKMg1Z6Ign6/Ub2JcSZeAlkebGb zPZYptJ9WXMC0t153fh7+OHH6ZScxdVXXiI0seuxcQzupNcPiFT2gHsGnjWhrKaxyR2nbhlvw Vgzomqjpgd4pcSr/GFs0I4fVrmOSHOQy7szcGroETU+VwW2ScEI62jjEiQ9rKyGOwY3awEffn 4yvW2LdgvUMFIy1eSKLPoGx6L1XWPoknsK1p0G83pgyPqLSEUZGLyPQ9GRHy5Oe8iAOYW+Lwo CBt7JyL/vif/OwKkZVaz9SHnFUpFpGgRONN7Ac06vW8B/77MgzD4WXtMqi+8salzrydIwe3gj 8Zu0DlH8MWzbagEC4qeBFjV3+ke7ayL7/b5HIBg4KITdZtpccUbIHT7ISm+0GBM8j3pVetj6A PbRj5cxhR6SVHkb41pXui28BTDXbUZ37wr1Sp9wYE0G59KjVLTVIsZevMNrbkK/LbYmDXxIXM Usl2lN1K1jhcrvgdrAwVhtyrEtTD6WuXRRnnf+YaE+NqnOdkMOL87HR/whggglf4lRPXNr4JF VHOID+tm/vsvEZbhv6mrHoU6FZw5scgfmrFaaul3T/5cYNqenQ2A916wdlnm6iZpyrWBpzzEh J+UEktjzV6sAExsV1aCKh+rLtONEA8XWlMFgTPrfOTLFCs4dKuCFBYY2e4TmlpP7S/wleTSu3 d2zJFul3SjS+tJu406rKRZpY52VwPkaGCsB/MPzT3WkI0WQT6wFtg67Raq/QNvoB+/R5ImRu+ hxrhvCtnoALdgM15b+SopjdEojKzy0IWXgAXJ/nnv0QSDlvsegh14IcTlbxDz31D25NBFXpoz qP854NvmJ61/d/FIc 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=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:18:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/C6NBoAG9r4uHDmHjzHFIVx0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Optionally install the resouce-agent so it gets picked up by pacemaker. Signed-off-by: Lukas Straub --- Makefile | 5 +++++ configure | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 8a9113e666..2ebffc4465 100644 --- a/Makefile +++ b/Makefile @@ -973,6 +973,11 @@ ifneq ($(DESCS),) $(INSTALL_DATA) "$$tmpf" \ "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \ done +endif +ifdef INSTALL_COLO_RA + mkdir -p "$(DESTDIR)$(libdir)/ocf/resource.d/qemu" + $(INSTALL_PROG) "scripts/colo-resource-agent/colo" \ + "$(DESTDIR)$(libdir)/ocf/resource.d/qemu/colo" endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ diff --git a/configure b/configure index 23b5e93752..c9252030cf 100755 --- a/configure +++ b/configure @@ -430,6 +430,7 @@ softmmu=3D"yes" linux_user=3D"no" bsd_user=3D"no" blobs=3D"yes" +colo_ra=3D"no" edk2_blobs=3D"no" pkgversion=3D"" pie=3D"" @@ -1309,6 +1310,10 @@ for opt do ;; --disable-blobs) blobs=3D"no" ;; + --disable-colo-ra) colo_ra=3D"no" + ;; + --enable-colo-ra) colo_ra=3D"yes" + ;; --with-pkgversion=3D*) pkgversion=3D"$optarg" ;; --with-coroutine=3D*) coroutine=3D"$optarg" @@ -1776,6 +1781,7 @@ Advanced options (experts only): --enable-gcov enable test coverage analysis with gcov --gcov=3DGCOV use specified gcov [$gcov_tool] --disable-blobs disable installing provided firmware blobs + --enable-colo-ra enable installing the COLO resource agent for p= acemaker --with-vss-sdk=3DSDK-path enable Windows VSS support in QEMU Guest Agent --with-win-sdk=3DSDK-path path to Windows Platform SDK (to build VSS .t= lb) --tls-priority default TLS protocol/cipher priority string @@ -6647,6 +6653,7 @@ echo "Linux AIO support $linux_aio" echo "Linux io_uring support $linux_io_uring" echo "ATTR/XATTR support $attr" echo "Install blobs $blobs" +echo "Install COLO resource agent $colo_ra" echo "KVM support $kvm" echo "HAX support $hax" echo "HVF support $hvf" @@ -7188,6 +7195,9 @@ fi if test "$blobs" =3D "yes" ; then echo "INSTALL_BLOBS=3Dyes" >> $config_host_mak fi +if test "$colo_ra" =3D "yes" ; then + echo "INSTALL_COLO_RA=3Dyes" >> $config_host_mak +fi if test "$iovec" =3D "yes" ; then echo "CONFIG_IOVEC=3Dy" >> $config_host_mak fi -- 2.20.1 --Sig_/C6NBoAG9r4uHDmHjzHFIVx0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b6/gACgkQNasLKJxd slhIoQ//dLzLi8/Adnqd9wp7sxtQrOBotPXEaBg0ASiZ+MVF6pbvKR3XdSxL5FlC 1Wze8gNizQwQfmJsthxd3ix0ugudjqy1u4qTj8HkGgxiW1XZDz/PPbBBGx50msaN ejlPesOIrc3+3see3VWXfvAza/8ktvu+A/SOkDeWtOaPf8ozfOsvzp+KMVWBKu3p 987qMQVINPKa+W8xm+/arZeTp13YlBiwANfi/p7gdnGIEk9ZLfOokFNjZ2jBdjIQ iiuF/IIQdpbzPe1HhBk4Lkmu9sLWzo2bZXRNfaOxDgy4FFWdVPzebeePUC9ZUnqU gcZbIUlutU9uCLFLa6GzOpyxCZct5QT5Dr4QIGazgGGU2hPMlzPoyo3sJ1bm3+g/ nUpGa8Ay9kWWdHNVdzf2nSZeQ/AukT+4j1eFA2IJszjK5ml9vDGlbaonOF0qJnF8 Ql1kgBIRlQ27D+TPKKIMyVcPkCFXcHlyBSFPvPNeKuCeQp93I4IXQUOtx9jEGbya cHkKL0IKFPvyQ3E0TYmb/XUZbxQ05jfZN96gpBYACZ9Z8UwZxbIDaEx2jgj97kbT 4GLfew+x7ZCOUhPS+e5LQljfIlIeVD4EKiJvxlba4qIHgf1gAfRJ998lzZpSLy+m BfRrTNERKbHKDaJhnVN8D6TRXdZ7ct8PsaaCLema4ptTEPljb8U= =JArT -----END PGP SIGNATURE----- --Sig_/C6NBoAG9r4uHDmHjzHFIVx0-- From nobody Sun May 19 05:22:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1591472630; cv=none; d=zohomail.com; s=zohoarc; b=BiUcPk+1Kj43pw8/jcQQLHrA4MaLg+gK7yl/4EZyYeW12p/tpRCE7gRBg1HUSc2w2kkbgiyHVKF+Z/rvyIYJ5LPdmo/KuvOawY5XgkmM7STwp53/AKdTbFfWY3GCfyxEkXJL1j+MljJpbCoFb5fXHWPefHUc0UyEXfe+4SahPr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591472630; h=Content-Type: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=PCI9v1TIN9fslp7TWYM5Z1p4UyDjMOCaUMLRPqGUwLk=; b=SwByO3ybGHkDIgfMsXz0plZjeSxV2wpEJWzvCnqVtc62l3VDAYypODknqDN1uHT6lvZR6k8QeJgoWzRVOrt08MWrQT58YlOJ2+/Mi8t5KMAYYuBvaNKQd1oqCuhCmcvBy+YwjLgO6pfaCOxNi6+C9EJtSkyuPjbHyyyeFF4KhjE= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591472630600790.2733263751722; Sat, 6 Jun 2020 12:43:50 -0700 (PDT) Received: from localhost ([::1]:39376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhejM-0003av-Kz for importer@patchew.org; Sat, 06 Jun 2020 15:43:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheLE-0004ov-GA for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:56 -0400 Received: from mout.web.de ([212.227.15.3]:45719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheLD-0005gC-BL for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:52 -0400 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LbftD-1jE2fW4A6l-00lCC4; Sat, 06 Jun 2020 21:18:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471102; bh=PCI9v1TIN9fslp7TWYM5Z1p4UyDjMOCaUMLRPqGUwLk=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=VHoP9c/EwsQbShI2m/encPh+84vTxDZMRIQqpXxVdROERLpBwOiIKvUPoA2UwBRoM Trv6a0GUUojazmXKNbLo+WeEq60Ckx1OW0WF94OkMyrmH0RYayDOTTvmz3I2YuGMuf mKNatYdq949xAQud/xVtXxyHHSHoE/1wbh8fZEyQ= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Sat, 6 Jun 2020 21:18:20 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 7/7] MAINTAINERS: Add myself as maintainer for COLO resource agent Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/2QZByna4AgwUQHdn4./osFb"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:2OeJiL3BWZAPzUk9ak7vxY4H/J9dGRdDz/EsfDEBVqf9t72Yzia P6x/UzKSYnTMQ+flavZ78Mw8gUcenfkboNLPOZ4+llk4koabHkJDi+ykexoG5sbneNgbFYW inyGCroKvQX5ZuapNikwbrB0n3Dbp+GCqGbuWSjJspt5rJ1zo75Y1dxcysiRTElOFAflh9O IeEvxzFIRS0X6NdOFo/Tg== X-UI-Out-Filterresults: notjunk:1;V03:K0:BN8Za0EJlNM=:4CoCiVv7Oy66dS5ZlZkJBv s43E37qnbvsgOyiLzrZeiZWCjU6M2m+VysykOG0nU03WbvI+RVLrcmrSgwuVT0BPa4DlQ+hLS QPUA8L0u/ivUQ+XQd9Vrn3SmdSszi1+AAATWW2lz4rW9RiXlYJjvEjgWlpf1qycEuGlBHHbZN te1rSa+Jv4XrJOOrTJRJfsIzzn5nR72Bgb/Njr0LrqSfvLFaHmd+N91dHYeLZc0xbHGgrF4Ax w2EHMpLqlg1m1bUvVurEFwjsZFiEDsk2s/DpCa2DLiwjd/1TpyKg3ngbS8Ge3MZ414tjujDJD CDFE35GEXtkPluL464ubm148mTu+b+OBAnvrZ+sAt56UnKH22hwHb693LIUYP4X4rSKdyLRRo JaH4idPzwRdVSqV5eduag63Ybmv/f3MQ+titnUWFWBJxwgDxii4RucCqk8CEHpXnC+0PiQHt+ L/JI7c8WIPpZXTUDfspOrYGUxsWKjQ8o/uPsub4m2wo3FGjcPIBLTKSJUK0a0W+kXNGY7FswG 2ChuCyu58b4PMqBSOQxSmO8dKdTC4uW9uGuGz2fNjplYFLmUYL+Ufee7kLxRHdQg/r5nVMvfs N8N8dHlr56rGn/F4JgIC48KXL7zLk/fZO6SANu45Fjx4M75/aDrOcPHE9MdveMT+0NxdVNdl5 bQyAaIpHm1uRJj9daSEnYIg5B0QwKbPJ6pxBZLizJrAyuSITCOqZLzEcTDwjtjIKoXNXoLEX9 KtoPNMBvNw/XLlfgEZ8lhock2//7mQOYAJ0tSZcf49JqNQDjebBusMKoMYxIB+5dBShs0zEOZ lZyIY2YLoabTKWHMQmSc6MMsqhRqAbO48W476eA8Ekr8mPRm0RXJ3KhvZD74yJAbB5Q7rOymD KQU5v0zbnTDNPpFsoEr4K+XH1fJ4EeOEteJKAt//dRQk0ialWHWsYRXZbSu5E4cvr3qfXYM5F Rz9Z9xVCmRZQ5txg81VzCYeS94KE4EDVwOaQTlTxjWRkAa/MwEEzABXbvOYSd58ZVCKdtjSi5 +fGwnxtp3XoAvOG/cvEiC5eyExgp8Q4bh1oWhxB9iaRrcqEH3SXm+Vsh74q1TXI8n1P4YtzZd 38IfskUHHwA5YvgQyA0W9FPDBSztG/J0q1pPpU82hRmmn8CJzWgDpD5osCiYlOaH/sC8j7Ac1 3U/27l7p0bdVBJtmtVy9rxydvue5CGLTEzUVtDEclWp3QrkDNCSk0PjSULtzP1QnKfq2e2s9c FDZMUWay9j6l09sIy 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=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:17:41 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/2QZByna4AgwUQHdn4./osFb Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" While I'm not going to have much time for this, I'll still try to test and review patches. Signed-off-by: Lukas Straub --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8cbc1fac2b..4c623a96e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2466,6 +2466,12 @@ F: net/colo* F: net/filter-rewriter.c F: net/filter-mirror.c +COLO resource agent and testing +M: Lukas Straub +S: Odd fixes +F: scripts/colo-resource-agent/* +F: tests/acceptance/colo.py + Record/replay M: Pavel Dovgalyuk R: Paolo Bonzini -- 2.20.1 --Sig_/2QZByna4AgwUQHdn4./osFb Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7b6/wACgkQNasLKJxd slgv2g/+KRSPf+RMet1gNF/WR7Y2Bl24twc+JVoGGnvZwJZpqfDb8OCpvLBuLkHp Dm6FrTQeT90DD0S4+ujjN/Cr6I7jpWAlr+fQylRZ5nbwSwgYi/qe/ONHTcP3GWNe 4g7VHZ/ZT8cpfdTKovxSGwXDE8rzVH2+yXKVn9AXYbxfHfbCuTQ9cq28klQrGbtt 84eSvURyVUcIuny8HQiHR0uamLeYjInBfSjFCIp5wT6ulISc53eNq3ZYBOAgFVK+ xUtr2Igw8gtvQKLnWs11t4az9uIFmCdb675vsQ740krLCpFKkaScrhoJM20SU1zX NDwGXzZJ2mAM4dUd/L8IQ2GmjeP9uDC61VT2Deo88nUSN29VVWjP2eefTmZF3+iw NPxl9lpjMVi66nX1aaIoUTxtPqhwdFic+OofdXvQgS6wX4tZ9i2/O1PAAdUwCw/1 Dchvfn5kL6oKm9k5O2Ddydm8hEf/7LgBXAeaOa+EksSbhY2H/l2r1xVVRQYprFRs +cSHUiN8t0M8n4Ze2XeaP7mIrWevTNRzdVOs2ulDoKIiH3AzIMs0iCKlyyl7x/f7 /uVIffVmAWft8GM/AguCZlKPkDnDxZZU5h7PJjdyrkyLOgmarkk2l2HknSsWSWHN tYAAMKwiU4oaJeXTjbAGeJbURR4tmkCPppMGaHpFoEdu+UUjpr0= =vXPM -----END PGP SIGNATURE----- --Sig_/2QZByna4AgwUQHdn4./osFb--