From nobody Fri Nov 14 16:48:43 2025 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=1589200376; cv=none; d=zohomail.com; s=zohoarc; b=kQBQ1SWJuhGsvWZOV62/zC1hX5drNT1a8+zBBIvgabijPbEIXVT2oUasPNzik0F9rp7+9cC6QmaeuMvU3+UW8rc5B+NqIYVX7WreEMMXMpav2Bd0dgGwqLsjFMfu1pMOy6MXfsmTeBNfBjtDVMMmg6Mi2V35XGmOYV7sAuh/wP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589200376; 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=JuXSgixVsJjwB+xob+isiHLkmr+yey2rKgzvk0tc12c=; b=A+XCjB57CJbLOmdthDIaQrvuhh0bfr36AoDX6NFQwM3geuQExhG8m/vPlTqKVnj+bZJhRB9IYyA24jeUh0Re+zkdQV+Z8ZCI0EvWf9lImRjg2/vGaLFjzf9oy7b4ccMrSf6gElQOtgn4QYNyldpw31cvvLCoQBWITr1UySo1vmQ= 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 1589200376919824.0683107129535; Mon, 11 May 2020 05:32:56 -0700 (PDT) Received: from localhost ([::1]:45380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY7c7-0008Lo-Vu for importer@patchew.org; Mon, 11 May 2020 08:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Wo-0006BP-1M for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:26 -0400 Received: from mout.web.de ([212.227.17.11]:35071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY7Wn-0005xt-6W for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:25 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lj2QM-1iyW3a3W8s-00dFOX; Mon, 11 May 2020 14:26:56 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589200017; bh=D/TPeLNov0t6rmkFP3E5KzxL/A8EmZiUQlUmOgNwPxk=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=RToi7df7ENuhfEuHE+5ZtG+4Aa3g1p/xmJ730tewZIYz6lrkBYPkIjvCnZjbOht40 eDWFuVPH2B+DaM1n4xUs4ae50zT4kdLN3c6LntxSEC3NsPrfjwO2c+Wie5uYlTKsTk eDGfPPq2olTQ3aqq7b9UB8av09po/OTZ7H0tPEPo= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 14:26:54 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 1/5] block/quorum.c: stable children names Message-ID: <9df6b3723ec30cb749ceaa555d82a29a6d79496d.1589199922.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ZDbrF3WtSLAYs8zlKZizAiT"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:TIVVxpWm1nKnNCw1LaVnWP+BopzU4pmXBGarktqhyf4VbL2PC1h fX0lSGW74sPyoioVMcuboJRiUuwmLGtga/dGV+fvAvSAlqTFvuamSSCsMI/rECblSUgda0m HWIHAkEoFD9QxzTyMmLa3jmLRAY+NB06XIjLJ3DA5XGQPTpqkfhHyoacpmWQH4XRvyqDCTP QlAGwS5V7paOlx7lvDDWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:jMQYuGskO74=:QsZjYQRoZhUU8ABPzPUtec omlYvTjl8TPNKEwLXvN6EhEaeKoQdPsAUwqzYgnWB1/4mUMJYG5CGhThDNLNyEpGFqErr9cEZ IDM9vqG4sWFmXyCltSRycVEppt7eK69k/ZfkUIvXdbn8Jq8FFitRW5NGLrW9qkXkkRdwXsos9 Uaq9ygBp9W5bpju5vmHMSbUHaB1m/FZXOZyS5JdesYw2PUcm7i/5gCDw4LsLoi9oIYEtHqtvD kD92rmqJxNn/aDGWzDw6MqdRfv8YnYAC5jmI/zPH0Qj7tVYpw2HcJBjj1oOyF3qA0cF91DAPY U9AJhfDQmzereH3OaO0MDyZfLp0mswV4e8GqOjNsJEK4Q9t+8OD+vKCfXWxYBQLI1au17PATz cNJH1Ln2X65a+YHyYZsts2xMODCTUeOXuoAqul/gy2I8BrQ0zjZV4ulg/JHVQBGE8AzqAeULQ NNky8E7MJP0wKpMoWfnzMuixjkAOpkONgWu4NtpZznXGbmDTJHzsZxyrENqUXJ88sUXhsynTY V2WGJ2UnKY+j6huoTq8fn38VvEUMk+RyON2tHY8plcJTUQeCPfP9zu250DDD8GdgLsfJxZ9UD /9Kaw4y20uJGI/1xba0zhLOtdwAVoMBvGGxuKYQYcNsJy6Ws0MMdbGFpYkFpO+baX24ZOBDFs Rx3QciJ7DfaJeVw8rXcPgq94tDjqxFRASIbJM2Fe8xyS0O2pibgTcbGRLcLIPdVBC5eCZBkoj kwhGqvsNutYoT/c6SSlTcI8o4T2T/jHrd1wuTcIi142A3h3D8OSkljabcyrCbElD4DdyrQ+qP vH7acm3HNnwExF+tfsQnzTG/rkX2YG8ntB5Tq78o/W9FAWVVVPVv2m2Ro/jWuzhO1DgsXmFqN tZRnpXpqRK9CGDA24B7wTv1aZB3h/RkYZ2HKzPXkelio5TXrR67wk6PRlS+w39X/3qGbFDFP7 295SHdXqgYOA2QNi83GCMNEiI1V9snRtUPc1WL2+BxhsHlvHiqBY4KhrcmgvcPmk8Cm/sB3or UTUuiiGdcL4+63eds020bsN649lA4QLj6BI0k3uOYf8iPH/nMAaVIzPYoqJNx1HQ/k30bxjVn YhdjuTAZDmtx18uLy7bBTkwak7zH78JjTGU9pWUrcHbdpgp/2c3xYfRKYvTZxPbOfp+m/NwOz Ejkf9LxQGQx0MdBLGzbvtsXBXFj3QFGAMtln2yUmihCalH5zDhbnOtccevbGublD4rAdL3/YN PE2J8UK+PBO3sW//s 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.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:14:43 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: Zhang Chen , Alberto Garcia , "Dr. David Alan Gilbert" 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_/ZDbrF3WtSLAYs8zlKZizAiT 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 Reviewed-by: Alberto Garcia Reviewed-by: Zhang Chen --- 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 @@ =20 #define HASH_LENGTH 32 =20 +#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); =20 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); =20 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; =20 if (s->is_blkverify) { @@ -1041,8 +1043,8 @@ static void quorum_add_child(BlockDriverState *bs, Bl= ockDriverState *child_bs, return; } =20 - 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; =20 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); =20 + 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); =20 /* We can safely remove this child now */ --=20 2.20.1 --Sig_/ZDbrF3WtSLAYs8zlKZizAiT Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65RI4ACgkQNasLKJxd slif0A//eBbTHuzq4a3GtIT2Lid2N6ET3RA7RQTK2POcO9Iu96D9UHMNBZri0Zti 69kXkOO1ED7fVh0wIeviH+H+zl9+DZcMlN5zUYmaixlrdA0I7ycTA6qUpbktcwUW rV+VDHVvBS1T4mtjmHezIz7knRpLhpQceis5RgG3xUogKcI1F3t7PqcijdVRoFOR IbcW4Fe4xdr9jOah0/JpEv9uIbHsZXKBnLTwXJeEpMcZvbUzMMzCRJZ2Q5QNfcsC WxCQrubUxXENuVKlMRA27M4MGUh1toWkolbTnYaiaOYiFrmwnhz70xCGAcDJhlt8 guqetZciH9f20fp+z/d0yINvU8G+XELFlh5JKpPpmA9ykcp4gvPj4zhpJ0ercg/J GYRzyKWUJdF/vIdsnr2wR253DHmM9/8VK7gVPDyQSVS3TeSn0auX6F5YVFO5dcug P56aPyFZ97Pz96OOjobpA6u/tUR3rpTgTPq8Sqx71xI0JBvJJZfwaddxGzz+yCQ8 etlp73DXCRCdga1PEQw5NXfk+QKws+tM1Gr1Pmuf6LZGe6i0LktwbDyvzfFwYYYg g1mU8sY9EpA7r5DLHKMflaWcQy6P4G3O8OQiKl9VMdYzs+weA2nZJaFhnyTeRzrg h94LjoNgUhPzKKtCkZ+iiw+bTU3wXceyZaCjw0+VUQCrI0XB+Bg= =iZVd -----END PGP SIGNATURE----- --Sig_/ZDbrF3WtSLAYs8zlKZizAiT-- From nobody Fri Nov 14 16:48:43 2025 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=1589200711; cv=none; d=zohomail.com; s=zohoarc; b=humypItAi0WfUiLXJgfC8X3bAikiX+aUg81MfK9sPfLke/GGXoLxjJLZKAyweDnts4HNtcWdhGY0ErPpUdtQLtv0jU0QcAJ+geckV9kEGZyLMsK/jLl/C6nx09vUnWTzbghOTnU8kLavLAvPmFolIYkrBp3OEPcjYUM8r2/p1W4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589200711; 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=3mO5r41x+3FexlsCI4oOth+87TYJldFlub7bgg3IQo0=; b=ByYTYQFy56iQjQAY5j/7IS5DgXmcsqGYVrFvCRiXEfVYgL22P9Zy6gJD2E0oNKxmJBhepVLjmQJL02muQtdrEvNvUtwrQRNuzzGcwA6H/GomF0H5rlelA/zP9TA80Z+w4UCTy0bNdpmVjPpJXGuVdPTwAHVAGaIpCc+1imQB0PE= 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 1589200711230946.5801377734148; Mon, 11 May 2020 05:38:31 -0700 (PDT) Received: from localhost ([::1]:52098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY7hV-00043i-7J for importer@patchew.org; Mon, 11 May 2020 08:38:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Wr-0006Cm-IA for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:29 -0400 Received: from mout.web.de ([212.227.15.4]:55515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY7Wo-0005yR-2B for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:29 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MCZfe-1jPuKM2IWg-009SMB; Mon, 11 May 2020 14:27:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589200021; bh=lTo/JhFEDXuaNPIN05x18j+fNnceZj6xEwdn8WEqPAw=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=GUXFlATa8ommnNtWM7CGrbCBwipX8X5m2kyb6/eElw7Y0TGA5P/je++dlYzr+OAd0 ptIANqKfruguxBsfBSKG8KC8DPZLD4+6N0v39NrkPnx6klJ9oH8ITF9mkdmn8h7LdT xZOyPFchplpODPyX/WUlCLGK4DIOdzlRCIzXptt0= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 14:26:59 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 2/5] colo: Introduce resource agent Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5n6P0EL_SzrpOrGjqvGWcRK"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:YPEVo7+1CZztij583vqrkWMCJHFMxR/TCg8LguO2E7ugsHVKDIp vR1PbhLr0gzCWzln2sEB4Hs5dqzhT01XphsC8xcRkWuxdi2AAYMPgNXwYVdI7VMCBLW0xix lXXgNbOUeJM6/pgwyBrVdcBN+UU4psdfcX6pX0G/0jtkO8nK0IKhetFAoaNvRFr/1iO2egN jZ1jrgI94Rw2QF1N199Tg== X-UI-Out-Filterresults: notjunk:1;V03:K0:LXUoRgrMmNo=:5Xyc2ZMIydu9WPWEIFpXYl Nf/OIdy35fqHyIjp0BovuDn67NTyUPN1wrYWy/u7A8U6ECroPFSz6vck1jN/06Jd4eKj6r+yP hsVlLR9ENF0eABUfIscQkpRta9P+rBQtITAWwBvJdbslYnBsNg6RkFcBMUFUs8fJfqdXykjrH /UUx9vouRwHF5WmPm0TSlM1uhK4ivAHSRYUf9HLcvEV2UFg0TOjO7MWyF6Ml6KDfmwlZOE8TL LnDi45aTuXEcSNjQdRE9jwjOwv51TKkgUHZBf6pAxfF0IZ3s8+5JBbqWQwPoXNEoBLe0avfEm PmsSuCLtJP5dCeWGfmTbvEXkitaZYEfLWd9YifE0TJY2XoiOEaet5JGMO986sPRn1h87OOmuT rIM+W70/3VIKXPPwj320Hweh8HJoMhPP3bGLhp/ZnP4Rv5ZC6yAFfMFjeeHXIs0vZlJnGfkBD VuI4kFRALeKVXYyuJbgQLCahrYc5eZZor0pHWpn1/m77UqhUAmBHxHrDfd8pWVkJiLbl3u2N1 gunpAXZXSGm+e6e8T9D/2+q+75V9/4bjF19Au/furX/36Uke5/nXwPkqvcn5mnz58Icn1yBvk dtj4Wk5vWFEIahG6s929ffIN/yhEKWkRFY0eIf9AmWYMixIKpHcFvIzSj5ofdu0JRn/7Me14g 2PernnHt0yloa9PyIv2QCNXJsV+zepv9Zb+tTTImt726tPARfei+qxp4TQL5dgEEKsQlKZyrW eVrrSSVbtuX23iE+BONC5zaH9bHRtMUHWSspPNyRrGehxWEByLu4NJGL6T8+cA6vsMC2NpyNN tL55JoDDnZQhosx7GMIFQpZJGUKkiW+dsBJEa9gh2OuTMvxzjWpFUyA/8n2msr2Sb7uiBKZ15 P13qSe20SsWZH4aqz/+WL8SFJV9kgSZIM+L5ti84L8OIyRuEBkRh3StCnnb57kvqHrwVPHV+b mvghXmpXdJN92fVOOGhvfadx9Ra1GnykvxBloTEZwtt4a6qsnQuZCRNOKQ2mT0S3qdKzpM7vq N0RrwS59X5RsKs3mLpmk/SxmJ/J1+DlcbVFSw0YlBODAhNmIVtotiRAR8zuA5Ysil2Tv8XPb7 igRLbDrqN1iy3a0+HiU2jYJxhrbHFP+pkjM5iFjR5+exhcYkFPmy1khR5Rrd1r8r0lxJIhOro gp6MHE0nnBFdDeZfZir1QrVJd2zF2nbytcZ2l2tLFwaEpMTT4LodEG951G8/lbrkLf8ES5i2r xWxcTBM2j0dP466dl 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/05/11 07:14:42 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: Zhang Chen , Alberto Garcia , "Dr. David Alan Gilbert" 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_/5n6P0EL_SzrpOrGjqvGWcRK 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 | 1429 ++++++++++++++++++++++++++++++ 1 file changed, 1429 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..fbc5dc2c13 --- /dev/null +++ b/scripts/colo-resource-agent/colo @@ -0,0 +1,1429 @@ +#!/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_disk_size_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_disk_size \ + =3D os.getenv("OCF_RESKEY_disk_size", OCF_RESKEY_disk_size_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,yank" + " -chardev socket,id=3Dred1,host=3D'%(OCF_RESKEY_listen_address)s'= ," + "port=3D%(COMPARE_IN_PORT)s,server,nowait,nodelay,yank" + " -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" + " -global migration.yank=3Dtrue" + " -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 id/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,id=3Dparent0,format=3Dqcow2,file=3D/mnt/vms/vm01.qcow2 + + Options to pass to qemu. + + + + Disk size of the image + Disk size of the image + + + + + +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) + answer =3D yank(fd) + # Read answer of timed-out command + try: + if "id" in answer: + answer =3D read_answer(fd) + else: + 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 + answer =3D qmp_execute(fd, [{"exec-oob": "yank", "id": "yank0"}], \ + do_yank =3D False, ignore_error =3D True) + return answer + +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 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", "yank": True}}], 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, "y= ank": 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, "yank": 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), "yank": True}}, + {"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 + + if not OCF_RESKEY_disk_size: + log.error("disk_size 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 + + run_command("'%s' create -q -f qcow2 %s %s" \ + % (OCF_RESKEY_qemu_img_binary, ACTIVE_IMAGE, OCF_RESKEY_disk_s= ize)) + run_command("'%s' create -q -f qcow2 %s %s" \ + % (OCF_RESKEY_qemu_img_binary, HIDDEN_IMAGE, OCF_RESKEY_disk_s= ize)) + + rotate_logfile(QMP_LOG, 8) + rotate_logfile(QEMU_LOG, 8) + 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(role, 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) --=20 2.20.1 --Sig_/5n6P0EL_SzrpOrGjqvGWcRK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65RJMACgkQNasLKJxd slhoZA/+KGhIvEU3t/A/+Vi4yxPfTBaLdGAkqAXt7cNw+4kSwzUU2wLNIaxvGl9p ufUF0/k6N5dzPaRQ5DGIV6psR9wZQacZdlkHrWGdGD/UGtnR5uieVlNJBD+yVDy2 TYPiEwgmo6ZcB6PWSqqetdeXsd5HST6w8d+aFJJftp+ab/yWT72Nk33BWKnPOufk I6O9XmGz4VBhGKzJfSKfXtBpxi+vjod8YjuC3LAZo+KvwxxGbOYabXn73+sDjF6I mBvaWOy4keaVCJZy/UnRMM2E9n0ddUa4T0OQ65xRuUj/YZnyRu66txa278HXG7RB 4ikygTzcEy7VDKKLd5KRlOPWKw6zXuwZZ1r3hBY18rd1NZPAhnjj3QPiqCrh/rQv A+6ccR4HVoo+srnDVmaGWfDdsCOz+i5kQxrFWbZT9cgwVC3vpJkYbut0YILjWIJA jrZpZAjOVPTsf28CWDHBYsFonpSDo8edMuzMATbSvSTzICk4ob2ggaAumB7ePat9 xuqa0/5qlcb2+h6TBzrFGhZis5fPr9qbZkQcK+s9q33r7jLJ4thFv/Mfrr4IPTIQ DvGzp/LDgsVJ1x5osdbq3Vk6xPZ0RsVYaNjRstdz8ns/IP106KpoK4G5GHenwpA1 VxMoKM1qxvahkMXa8VvLuI+T218hLJq0Ca4z1iglpYFduKkMdb4= =5T2s -----END PGP SIGNATURE----- --Sig_/5n6P0EL_SzrpOrGjqvGWcRK-- From nobody Fri Nov 14 16:48:43 2025 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=1589201015; cv=none; d=zohomail.com; s=zohoarc; b=k14hvdJ6DLEOBNQhCDY1AWAyNaOu22YdLX4/fi0sARDOPzziEvvf267wcJev1VpWnRZx7RFtwwIxHBoW+oZciXuThsTvnBGxvb6vMplVcJzXZzGaQGd4p07n+qRjT4HtGiTju0BulUt0L8ooO56Ao2JQ4IX12ndOspVd6150alQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589201015; 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=p8CG6yHD4YBHaYrJaMe0ecOFEJwDAzSsOmj8/x5mw48=; b=madXcumK0H21yJiL/8hFpNQp5dQ1vVGencvRQg0iCsOBktRIC4w6NyKVQ7atdXrqp3ZPTgY65x4Pe2mD1zbnyqaSxHx6SNkdipahhNMo93XOcnt4lrGbRfAWcTZrbd4aPSIt6c99hTlOHFjolF/VdNYuEM8uz+nNodZ8GbRySVY= 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 1589201015295840.6703336084382; Mon, 11 May 2020 05:43:35 -0700 (PDT) Received: from localhost ([::1]:56644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY7mP-0007Jb-Jl for importer@patchew.org; Mon, 11 May 2020 08:43:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Wz-0006KX-Kk for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:37 -0400 Received: from mout.web.de ([212.227.17.12]:55165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY7Wx-00063s-Ic for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:37 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MOipW-1jVNxn2e6I-0066m1; Mon, 11 May 2020 14:27:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589200026; bh=rnfo5wlSh1RR4WxeQMA/5WmY3QFvd9YmkSEwfqVvhyo=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=WmF3YA0IlXzJUrrf5euVybm1hB6/6xE6ZxqNwCrrjKiVeDoO4RplpDVRHOQrRHsNi gQGGzepMAQy79DDDzZ/CwqxXDwcbOM0TMW9uqH9gahu4N/2/4o6xfufUJDs7QrmwIP ZVb7XDlsxiyAeXB5MfZj6uE24VJeCvvkoGR0CDeI= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 14:27:02 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 3/5] colo: Introduce high-level test suite Message-ID: <9ebbc340436b2b60c27bdb1fc5d47734d9854514.1589199922.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/IL7kIc8_GfiNyIaNvIwX.L1"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:KNomQMa/40NiyynFHRXACmb/n6e3tmf5C1DZ0tOuTb1ab6/4Lya kY1bqJrB9syOlnoKcUqeRzXkNmwlTrHLqqP0GRP/9V1aRtMYkZbvyl4yow2Qp/WBvqhXaVN QPLel4vC3oGi78+hlVCTVfiSkAe+YZFOaftogsMmiJnk+HasrDaGnQlVOKoFEDw272GssNH Y6DwxExArDwyaSNMllD8g== X-UI-Out-Filterresults: notjunk:1;V03:K0:GhXrWHrDMfs=:xB1219hGDRtFSZ/7mDcqg1 biFSkk/5y7yFSaKV0juGqeUpQ6FQ7ZAXEVyDT0lAhZ09tLNjWyWSPz5zra56+kC/1cEtJI8WR cKy3QBr92xEDHHQLL7CjAm7xEEcMUjXBftkK0UK8160XVMDOxHvF15OPMR4y2ZKXzUuAMPYhz hPPWE0QX20a4YXt+IedI6Bua8sIZKEPrnZtwuvm9yB8lhhpVzd31aQd7SlMfWoQ9hamGc+bTZ jjBNqXH626K3Ahcw7Aw/gRSQyFcEIcovLD/A8V4yX+6Env6lTqlLdMNqXXg6VbF+JyWpSPSSL ybGxKV9ZOhckp1nx5UZyBE51VIGcCnsE6GJzIwhbg6UpIXer4T3MpTNAjuCWXuvroA5rejAIa GN6I/M+d0fnNC/K6w8PGsFY+P+reVRdYjFpZHoA5bKhGyNkjRqXg+AH5TvpKJCcrNgxuqHDUP UZMiuQ2m0A6ojssLbrEAMFd6FFZvNvnxJUOYmkYJkgDku9OE955YOu0+HKv/9dtQIjEwc3kj9 WFgfemX7IPAXeviYwbFxbzLx6IM66S3XxOkSnasPuCr0KpmuokvyCYJ/c2dcexq9rZ+6n4x/D t2ou6ejEcNrZYZqhOClXsUlU8DGX//b03DMU8/8+eUfAarjgY1ZW0AhcZh3cA7Ktj0ZBAbLMs QsJrrz2R/16L9BAuaiSlbY+a+VBT2JHCXQf9dV9SV+PRyjbMRYKWLEnmx3sWDWo5TG8Iauv1s qzX16nLrJZ6Y5FWAp6T9YhD6xvdeKTqYLRQnE6aWUMDVbdcyQE0bROTerdH+VCePahvT6sd9c on8omBIIrdsedjnIDzCNE4hJnRkdigrGxhWnzrprcXTmYrp+L4LSeoUWaKAi8UjRk66CdPWJk MjgZg0xJ1qbJudhy+MjZAxqMAxhhI1Qs5WL9sCtIwtKBtXMopjHFlZjH80Xb3oI0kOgz0INcy LbG1CJUJf8W6rhbfuacCdqCUKE066c4Og3FxkvJ2zB5kHownCK1PNSgzb9I1tWbrSWhFKvSjw ztR7yIzHrTTIDer2s9td8XTNfSgUl089lknJ5cri0m1Q/gGfFVbK8cUhA5+wgCdj6rHJ2Rjll Qt7c7hq9OwIMT/mfeVYfKoK9qnd4dIqrhhOFT8d4QJ8B+q8hN5QCJ4U2bC+wzTazOb1EnsPPT 6y+oJwhd27fx+SGyBMV70JOC857RQRhrRxxR+H63bS761mcD6pBra1vxSF+0nvXhRCBnpdDqL TliuLnoDy08ZetrOV 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/05/11 07:10:54 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, 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: Zhang Chen , Alberto Garcia , "Dr. David Alan Gilbert" 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_/IL7kIc8_GfiNyIaNvIwX.L1 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 | 689 +++++++++++++++++++++++ 3 files changed, 745 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..465513fb6c --- /dev/null +++ b/tests/acceptance/colo.py @@ -0,0 +1,689 @@ +# 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 select +import sys +import subprocess +import shutil +import os +import signal +import os.path +import time +import tempfile + +from avocado import Test +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 pick_default_qemu_bin, BUILD_DIR, 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" + IMAGE_SIZE =3D "4294967296b" + + 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) + + # 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") + 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.params.get("bridge_helper", + default=3D"/usr/lib/qemu/qemu-bridge-h= elper") + 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_disk_size": str(self.IMAGE_SIZE), + "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,id=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,id=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) --=20 2.20.1 --Sig_/IL7kIc8_GfiNyIaNvIwX.L1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65RJYACgkQNasLKJxd slhjmQ/8DyzO6NNu97Hlo4+a/RDoO9IdW5wG9ztYoG89wjHi6Yl/iLPRO2YrwVIG WrfIf99stRHpZt8crc7+ztRqu43keqq0Fp2nD4xFfQ7wPdEFNjDJs5r7kVfeF6rz 1U1dWJTYdYO/CzcBDcQ/dW4LlR9C/poXPsE70BBPrxbFQQ6GW30Zr6ajGtoM06/I kwCsVjdnB2UMavgP31nZea+6tk433Fc/JZomwuVQjMHlyLHLXlXNlaNJj+JnwGlC 8tR9ucfSnD4wkPq6++Epr1IB7OtPjQdNFNFx3m/B+xrOShObQPjU/DoGdtB/0Pc4 le/YKD+Y+ZOT11jC0KnHWtJjCux3jXBav87owiDa3C1DCw0OWex97/UO/gTxemBP yvDW8lpOlim7s/cYO7l+aCJk632jWUviBZCJwUm0eMxhFv381OxIGxZkORdyxQeh R3s72EpFI7Q1INdhD8e/Tcwb3sr9LfUTqbG97O3PULmmoUKp0MTWrn6y21LF3d/k MIz2clzHOwW65vp5LEvtKLe58uu5IX1VgdKRuwmvmAO0qIR69vW/Fh1WayxROJDx pWUUud7Z2z0hjpNg8ftCODisA5SFd7mF8vJx+yiPTHbTLk5W0HsGCIJIqcrXvdfm AbbaP/fSoy1o2LhVQ/giZkj4hJMTCoDkiNgvKXDpGCIHBWjaBIs= =TDb8 -----END PGP SIGNATURE----- --Sig_/IL7kIc8_GfiNyIaNvIwX.L1-- From nobody Fri Nov 14 16:48:43 2025 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=1589200719; cv=none; d=zohomail.com; s=zohoarc; b=LkQiZecLqsOegB9VFyKUs2FUZlEYn6+HOa2/MRJc4HZ2JiANMosF9zsngnaBOW8rbItAvj/EYi0LQsLjbWK1MJfZjjGI/mMSlBXbh4mI4nTr4XdDCRkK9Zq2+aIfukhHWYaAmAEAZXqEC1h//33tq7mwGJkycYDXTLEX2iEEa+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589200719; 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=lbkmtUu6OM+XFjeCU0YkJ3nC3+RK38O3T4RDwn8zUfA=; b=ZRZuEMgdV7I+AYlPXJt59dfq+Z+v8VvlYyBdYWnaw7WzEigBgB/hDm7dRrqmrTRqZ1ZcurGokNByu8CYtnH2VTUaVbick7SfybThYCU2xLOd0lUyUqSci+X19swhx7u6keCNNMwfHbN2wIUg7I66iOguHBeTw6RU2d2Of0h1fmM= 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 1589200719244675.6279692773684; Mon, 11 May 2020 05:38:39 -0700 (PDT) Received: from localhost ([::1]:52190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY7hd-000461-Nv for importer@patchew.org; Mon, 11 May 2020 08:38:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Ww-0006Gu-No for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:34 -0400 Received: from mout.web.de ([212.227.15.3]:60591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Wv-00063k-SG for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:34 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LhNmy-1ilubk3QxM-00mf4N; Mon, 11 May 2020 14:27:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589200028; bh=Rdxixi7KV4eiUZcjalX0wrnXk1aVs2YQ0vK98vYI6WU=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=q3d/oDlEOOkPZymhC29pvlAMCIEWksXfdkjcn58o1Mlom7oNQXyB2XymNGCdk84cv 6rXInsKeWYYIad6RIDpuLmlaws7znUslqWP6rEhiPga5aLt3AZUNwg0eqxMekxB38z c2Mgjx+KToamCdHSzTL45Ph5ikIWkao6p5XRKDj4= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 14:27:07 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 4/5] configure,Makefile: Install colo resource-agent Message-ID: <334d8321f91f23759ef82a7b904f977003164475.1589199922.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/hyZojprBdL+onStKDkN5i4L"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:kzRApTIPUtXSXuplx1eKea1e2uuM1fGZVxV6CUIhKCpSXo+GlmG ZwdaCoxJqxNfnJZB2C/fgG/xkJoDTwerSUv5RBo0dHqWbXPheMRHmmn8NI5auUyUCNZQim8 kSBvjDDTAyB5BFg3wIi2z8qu2Ps+OeXYGh0WbEMFcVNQJ3/fBGxLICtMREyP7i1AdBITAGQ D/RrsVGxey1F7H5v+5yug== X-UI-Out-Filterresults: notjunk:1;V03:K0:A88D/8D1VRs=:w2cXqlouHjy1Yz0HM9EBOV QOPXKFPmfH82uHLqR64F+5TrhGjXxDbv61nYNAqKzUaE9INnA1WN01iYmM2IWrTpyxEGnW67A lgWQNjc+Rlm/9fzU3Y4GE9zk59HpOu1y81ZoY4Pto2OhTYRksprb6IjIZC8o8Meefw5qx5gsx rEvNH4pngsFjEIZGOcLnFUV7jM7cM7JRrTlefbexy1c5S229JLBjzmptLpVJvYXEfbrTFSAlO In8hEqI1NV0G+GgItZROEDR8+xJTnItQ1/k1bn6VSaAX1ycai9rwEXcfvpiHRP8NWzCgL9Q2R BR0osjGLYVPkm/33cJ59u55xXrlBlgwUtZ2jsAd+YuncyejqOFVO2ryip1uqEhKL7GoOnCU5D QBFE/B8TZdx83SC5mRLXn9cUULckj+0z7TlRJvV7x2E7F8KBGeSDBIUNdoDaed/yqN/e40CwA fNWtwEpJ+c6wR/mkhpA9ULtl26wCOx5YnVkgOYI/PNw5p6+G2WPouqPlNfpJElTNid/FPLsF8 s5MCVHkh4EKgg/VC0ko6FxlJrLhePTRecEiHScSOxtEbfa96CI6KJsy+4j9em4Z+UVabyzWM+ xhXJ61zbKDEu3px/ONhvn9h0I/EzeG9ad6HjQ7s2xBaoLqZGOW3aZKV7/EO/+l8J5Kte4YT7g B6c+gvCTOr+ZPSQ8+h21Vs1dmwbxwPVlokOjbkkjMQcEM9g2itIhZcPm0RvAV5h1qoS8WKcus up2vlmpTDHpSR9ges2OuuxmNjXnxCy144o3dVxdNucUJ3OyEr+zyOa17DRocaunAtGYU2JV3T wwcHcO3FEHfm+dzmkyQqzre1DyEYu5LuucIRn0ZeYcvqltZHqEReZcKm4rsNTe9sPD5Qkxbp/ 2Wf/4rFduxtZnF4wOHbQQqxwtY+VCNFlGGiPLc9h0h0+a6F7kHmHhr98hnI1MdWsxXz+jnFDh Do12la1sB6DHoSmiMaHJggwDC4+PR6KtyqmMgDzvfJVM/gU2iMYZJ/xtlPKN+FVLCOBRvJvXF 4sbBkPhoGXpFGd5vqyifH3Pc5f0Xi3JUP4D1H3DyeF5LWb6XwAY6iwr8DA8KmrhQqxGZFp0TJ spliA9btU2+hki9CshlEZylATslbywwKF8067uyhBHEsEJ9rKW3OKs4Gvd7Zp0roGlJ2jawu3 gXSvrxTXE2WTG83UypElTJ0qkrN1ARPRSbeZGq3u+jP0XSXlWCrjbmOf8/p0+tDDTmQVgMTFN gRWLN85ldP6FbgLaC 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/05/11 07:11:00 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 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: Zhang Chen , Alberto Garcia , "Dr. David Alan Gilbert" 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_/hyZojprBdL+onStKDkN5i4L 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 --=20 2.20.1 --Sig_/hyZojprBdL+onStKDkN5i4L Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65RJsACgkQNasLKJxd slg4+Q/+M9UtlOWcoWKBDO2Te+FUHe5EFvtvtVIGNjUncp4tq5r+rj/TyilkVGrl OHn8iv1Lakx2QHKKw6rPM0EUfluq5AdeVF2dZbZ53dYrjn6jRKRjmSVoBPmwLQKU BBHRLnIZOuGIYKTPnx+VFI+UjuBwgRoy5ahmXH3ZWDHu7Qv6A+SCYtXP/PweXNSd AVwXkNier5KCllwVRBmEuGGkmGES7Lkjfs9t3U5bkxSVkbXeCDs7OGnZdWeUrG8K CrnS3VbKHnbCf7nJIRH7M58wCxrGPKs+6YbW2ZHJ8x1R15TFFRlIylc/mFZ8NSFQ IXrajI16t7G07Om0p/C8ftXsBYqvfj78pcy+LqDeqwi3QFNm5w328hwdVWOgVKe3 8n/rDXUGUAdnaiK4WdpOTSvcmeZPOUBQ5V6V9KpVVGVWZvoxNoEkiRzbPWAtqVk6 VAhbaMcL3acQ9sW6k3KldGF5liDW0UyYgmEhMWpEX02udMl0ExA9EDdFKzAnpGED V9m6C/kHr2bb3ixModY2Cd21xho3LPvKmO/ce7x1VfR+1TEc6R++fnLz8QvrS7tK RiE+QnhM+wsSbHem1GqkedL3UjBZKAhf1SOy1IAxlaWMLC5mjrsrkv6VV+LvnUno yIW5JiK2FP3UjNjq9PB9HHI05xth7e++C5adCSZ0cJkOQ427fi8= =olhj -----END PGP SIGNATURE----- --Sig_/hyZojprBdL+onStKDkN5i4L-- From nobody Fri Nov 14 16:48:43 2025 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=1589201016; cv=none; d=zohomail.com; s=zohoarc; b=ktVEPW136wOd6s984s+4jmSROHYWEvRoFa3LTQBZx6WDBS2w3mCnovc/E3ET5hGMP3kxVqeysE9SS3t3dDjjhTVpmzNu16JXWVhNpiFwp1Rai0IvDkWV/0uY6U19rz7iqX6gfmhKiHdRm+HpaonG8yb2m/xOrFxTNY5sEgiEOhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589201016; 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=WHLl8IB544s/xbL4S9Gq3qqev/C2bzs+WF4myt75DTM=; b=GdY4KRdahKv8CfzHb8Vr/3dVbIeJcKwf0dwbRyRInc9GNNg4zF6Ubsobj9omHM9yTAAGzEyNC33rjLhrpFjrEFsL1enZEgCQCsVqpetgdt6aY6Tz16n6diOn7Q5BizI+QNYz68PvsR34TUI4P9MH6W4KeVRaWKCatkz0pzuelFU= 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 1589201016692298.89420131204986; Mon, 11 May 2020 05:43:36 -0700 (PDT) Received: from localhost ([::1]:56696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY7mQ-0007MI-TJ for importer@patchew.org; Mon, 11 May 2020 08:43:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7X0-0006LK-AX for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:38 -0400 Received: from mout.web.de ([212.227.17.12]:55115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY7Wz-000649-9k for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:38 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LeLWz-1ikXgy0UcH-00qCGE; Mon, 11 May 2020 14:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589200033; bh=WHLl8IB544s/xbL4S9Gq3qqev/C2bzs+WF4myt75DTM=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=cbkxlGQH2T6rZ9gSIELKLDnoQK7B4CBVqK1QZJHBEQoqspsLl9S8lWvIGpWc4B6iz nrCEPk9kMfE+oTDkUxRBLZBUXsCQ/XbFJECSLYqs4KPlJIMFHDZkgemApfij10bNLM UNCN/2nxhfloXAjgQWBIR2coH56LrvYa9ubF0N+c= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 14:27:11 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 5/5] MAINTAINERS: Add myself as maintainer for COLO resource agent Message-ID: <57d7784ead7a2f3be4437b14a0c69ed87bc55a91.1589199922.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/tqhr02zDZJ9i_MNE=83F3ke"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:rA8ZYAEABW72dxjlKx4b62qk8VzjlQyHSWFmMuBHAmzxmNQSYag u9zSg6qifV9j7h4+bfsIh/3gOsZjqltL/lyiBnCbdUtV7JwAfUtDcLnq++guFp2+vEFRjCM C+oZyWqv4KhBYixUVxOJtp9X1CNGdojx1EBqtevqgIAdt7qj0fnRWHQAgagV6RlBCuMP1Nf oXki2At3aT1gvJPA1fFOg== X-UI-Out-Filterresults: notjunk:1;V03:K0:G48vKEeada8=:qegn5ve0cO9B1KEGUmfjMQ RkbkkDtC5siS6EuLL6VqenUD6XrAYNnbr9hZhNODXVZh6THD2yEtHtJGPziMakXfwiGTcd5UR 7I8TVOkgX71tvD5oAWz6UnEjL9YkMXL/7QcnvgGJvgHkBpoddDQOtmKQ0jNQiOzdomB6N433m GdTH79mC5jBrdpikdwzhClcGByfr+rJSHBJRL971gILu/+K5Hiv8P5rMqmZp4DIw352Zv304O +ptC5jb2G7lIB9slCPv75Oyh7tfm2UUAThBPtEg2dp7g7xh7PB4FrBGTWPfNvSIm582q1UORp 052JM/dN8DhEa+kCdRuK93dwtxvGPwHk5Qsb0GHA4v5HCuUk77Wg5hTyX5PPVoXK9tXm7Euzt soSoq9+xHjx/vw7OAzjH2WWzEfotatAmIEo4hslr4/cDBht3z7hxG+LCMoprkcKYOiv/NdXvU lvNQoaa0UN35enh5jgo49KlGcm4hbdFshEclvDnPzrK/rGUCRlb2fKNtCniMRSR82WZrOFavb oaJyAoU4t/zgLWRDjrzpaFvL62flIy3hTvR+EOmP8xU/8SUtmjwZZaLYMw+QPwZB4x8zlDPD4 obMBjaPPeIDqMAEFdDgZOkXrYnmsE1GIqaIYbcPr197jO1dzk1WuMMaQjZPOHtpuIdDLApo09 a6Ir1sczfsCAv3DYDnk5GSF+kJiKT42ZXW8SNQt+GKz75X/Wlx0Kx6MWAjl2ifb/kvPj7A7lh QsQv4tkyizcviCXCisaJenyMOwUfJeW94SODSzNBO+kLmo8DpNa/+2r6Vl3hlsKrEsmXFAJSG +ZUwX8hUwhVFFA0xfFKOMXM1WlHrarXvZhqVhYlXdjUrmC6zhaDtjna9U7Ebx+qvfoDFNofvB fGeXNyZqUaTGlqdcW/FztQmW2QST2xPAr5KKjtQpSwFeNaRVOTJSi3lqgmKvzStjIFe/TcS+l VIw/JgQUJT5Jt1zQU0zNfd5CilmUlaeBi/mBGLni+0SjxETNFYNXkLO/tkqB58dINeA2UPKsR NeoHJXS0xBF10Epg0A5EgqzdWSwoT1zsSwOcRkgG1ozRGqZeLC5elW7flMziD+JzZ8J2xWHup i+uv+K6q1xu7SPg0crvGFHmXhiEj8xg9b9HTx5kWdd9zcsmvWprKf6Vt7XELw0PqOq5MVini8 qoi+XM5S/HU+mWMpA29y7KpuCAAMNZ4U7Kc3CiJbNrw9SHgTbtap3KLod48AiVSN4AGYjIBD+ IdzjMkE/+B2P++5L4 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/05/11 07:10:54 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: Zhang Chen , Alberto Garcia , "Dr. David Alan Gilbert" 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_/tqhr02zDZJ9i_MNE=83F3ke 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 =20 +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 --=20 2.20.1 --Sig_/tqhr02zDZJ9i_MNE=83F3ke Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65RJ8ACgkQNasLKJxd slic8g//U10f9tOlXyXC9RQPuopPuMipcghIJ18pUnsQb/KRlmne8I2xv4NzeKOq 0EiOlVmwoFrqTfbmXHumd36N0LHLuxwYpyRm5/fxxoDhEllinujJsZcodybUK/n2 Avw8Xb+uDG6c9J15yw7u8TRQy3aVtjtFLYIJh+67mIleginakKN8yZ/TuLuvDDSC NDHggjeGy3KL2+Y95UszYm8h/99cXoLeDDGJPy2IYtK53Q6e6TqXKlSg3Kf3E0Ut AdNODfjvMv7Q9p8CcjwJpWP/EUauXfraWTH+rUPC7XCH6h+j+3pPAPgV8sQEb1yH CwtUZ8Kgw7VmUqq/11EvaeZXOLlxVJ+sa8nQ/KlIt75T7BjN+7FgbQ1zCXWSgpEk lWScfERC7rb5nGss+2B5G6/ztp11ShWyshXpIjahOa4Bw9t+Cf9J+rjYRfdqbBFt Teal6DmGPgkydjShw3i6F8ftosK+G1UWbuPzruvV9igASWh4HDJ/Z8qTcZZxsSam u/hoGe3LdCmvlyHcCbxV+/OAneecyiDq3T7ro7YQJ0tk3Rlslil2eHxLVkPvB1xH 8P9TtTexE5JVcmsohZ2bjcKp2cxGQ+cjYxefneD4tbc0HbHGwgeTJDzadpw9Y8KT 2YZ5BSoWVibnA40WPcUByT6VQX7EbnaZO6UqoETckDZCeetTtfw= =QTmt -----END PGP SIGNATURE----- --Sig_/tqhr02zDZJ9i_MNE=83F3ke--