From patchwork Tue Jan 10 22:09:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=XTneUdPH; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ns4kX3Ytcz23fd for ; Wed, 11 Jan 2023 09:10:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7EC5C418AE; Tue, 10 Jan 2023 22:10:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7EC5C418AE Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=XTneUdPH X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y4tMkJtD3tG1; Tue, 10 Jan 2023 22:10:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0BD48418FC; Tue, 10 Jan 2023 22:10:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0BD48418FC Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id DA08BC0033; Tue, 10 Jan 2023 22:10:23 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 05F15C002D for ; Tue, 10 Jan 2023 22:10:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1592C81EF0 for ; Tue, 10 Jan 2023 22:09:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1592C81EF0 Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=XTneUdPH X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BUuPL_LiXnzI for ; Tue, 10 Jan 2023 22:09:24 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2DE1381E06 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2DE1381E06 for ; Tue, 10 Jan 2023 22:09:24 +0000 (UTC) Received: by mail-lf1-x12f.google.com with SMTP id bu8so20633251lfb.4 for ; Tue, 10 Jan 2023 14:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vEz5vu6cgWfEnGJoXaFaYFe9lhYCLDrKmcf/PzLkeww=; b=XTneUdPHQ6QYxVWcZBNBf9BCk+vb6F8UJRfQRtFnUGrEnvbDHExBBM93RYCkiyazkT 7oLom7ITR9r2SFMyznoqA3gZdvVKmyTX/iVF8u1xJ8Trc+MtNgPU8v4Bw0R0iy+IsCWW LlXmFNyoW72cZnkru4M4JcTStvDGlWHfqTZ/sYns2ewSHtcKGCBcszuR1er7GJHDnyV+ d2KjRQirkLLrb2aCnwFLa2NChGVeB53eimFdKJ0lRSKyUEWkuh+GhRwhx6BlOJtKnWh0 bQpwA334G7t7RNWUSkSq04f5RMNu359QxbhvbhDwGWHLgUmOo4SLCrA7K33gdEwsHfSF v0HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vEz5vu6cgWfEnGJoXaFaYFe9lhYCLDrKmcf/PzLkeww=; b=xxsHIFL5hwQp86jiNfq0L6v1IlC0fdKYGGwyQnU10gEUi2/qfVdriukve9G4dkz3Ie kLwyOAZXGTgY5OINGBlyVXNpUQ5mstMC9UVUIGwmFn6q+6ZO5HH+pbNwQjLJ4fPJoRuB YqA/3X2xoloZsCpeh44cLjvG9+ddIQAcYuO4kPI34nU6mfwq+sgf88T7ZWAu3/oFxBEl S+pIcrkZGjqbZa4VMXAwai1ztYnL2rAXVtDv8FW28/VXTfg5kkKwFgl5hVPaf5EN/4Zz 0n0EqVznLqWUavfUVmkoZwSHbBWGrHw51qKMAz/hK7GwLPifwRsltLs3sI99uQzNV8U6 2grQ== X-Gm-Message-State: AFqh2koxxH7KifvEakAuNaJ7j6nzkk2AuSd/5wW9refFSwuaNA3uyZsG fI8nc3kz80mC62Yz/EfJarzMRDRTx68Qis2k X-Google-Smtp-Source: AMrXdXvCwSQ7aAh9KWDg2PJJaGRcCPDdDpyD1xIM7FD2EeWyUwXbtcgtiUPdgs8f1L+NsjTMiTdakQ== X-Received: by 2002:ac2:51a5:0:b0:4cc:8017:dee9 with SMTP id f5-20020ac251a5000000b004cc8017dee9mr3110537lfk.8.1673388561894; Tue, 10 Jan 2023 14:09:21 -0800 (PST) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id f5-20020ac25085000000b0049313f77755sm2377456lfm.213.2023.01.10.14.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:09:21 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:09:10 +0300 Message-Id: <20230110220913.3528012-1-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Cc: Vladislav Odintsov , Ilya Maximets Subject: [ovs-dev] [PATCH ovn branch-20.09 1/4] ci: Make linux-prepare trust system installs. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Aaron Conole Recently, the github actions CI environment has been broken due to an incompatibility between sphinx-build and the docutils python package. The pip3 install command will upgrade docutils to an incompatible version. Since we install sphinx via pip3, it will always install an appropriate version of docutils package. By forcing the upgrade, we created a broken situation. Remove the upgrade command and trust pip3. Signed-off-by: Aaron Conole Reported-by: Ilya Maximets Signed-off-by: Ilya Maximets Signed-off-by: Numan Siddique (cherry picked from OVS commit 4bd37558104b5d8376c52d5d11ced67a18d51aa4) (cherry picked from commit 13770dba7910fec97c17e69f9155e0d75209c072) Signed-off-by: Vladislav Odintsov --- .ci/linux-prepare.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh index 83ad3958b..37e8d4250 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh @@ -13,4 +13,3 @@ git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git cd sparse && make -j4 HAVE_LLVM= HAVE_SQLITE= install && cd .. pip3 install --disable-pip-version-check --user flake8 hacking sphinx pyOpenSSL -pip3 install --upgrade --user docutils From patchwork Tue Jan 10 22:09:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724373 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Bc4StfO8; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ns4kj1rW7z23fd for ; Wed, 11 Jan 2023 09:10:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4B0458136D; Tue, 10 Jan 2023 22:10:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4B0458136D Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Bc4StfO8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NhU_OLh8y4Ue; Tue, 10 Jan 2023 22:10:33 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id F071981FED; Tue, 10 Jan 2023 22:10:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F071981FED Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9D00FC0033; Tue, 10 Jan 2023 22:10:31 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 14C0FC002D for ; Tue, 10 Jan 2023 22:10:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1FCB3610BF for ; Tue, 10 Jan 2023 22:09:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1FCB3610BF Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Bc4StfO8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hvuCWuIhaxL2 for ; Tue, 10 Jan 2023 22:09:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0EAB6610BA Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0EAB6610BA for ; Tue, 10 Jan 2023 22:09:24 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id m6so20625988lfj.11 for ; Tue, 10 Jan 2023 14:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xPaSNwAmh+qtZ6/3qaerPfbZZH1r9tzYt8jDzB1nfPs=; b=Bc4StfO8gDMjKGZ0RFf66poYXs0YzcgmOQ7aabF3BlrsjfZ64mT1PtoX3/iP7jbLAT +regaWi18krYvkEh/oEy/EcDoRdyY9DlpYIXcvvdHoz5c2WPagaJyFsULH0dc3+eSo1T 1gxteC9JIBj5ae7Iq28eRhmzsaRNuLEIdy5VOfJktHUMUfWsRcaxr4MFLgJi8Aib5NmX bwkwJ3kBawsBxkSfl6GXMlxhZlLLaJZxuEzFfbIYqrf3mZc+1miBmvq2TTIVWVX7rh9U GO+yosFb16oFBT8xa3fgLuBw28lEUnGTN3djYZKXmU2znbU4PgplR4AgFcLbUsDe9gTT 15cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xPaSNwAmh+qtZ6/3qaerPfbZZH1r9tzYt8jDzB1nfPs=; b=R59WxVjcxATvUh7GwBy7jDd7ewVvhWunKAv4JsWcqwCvXj8m/IVITp0G+7CLv/juv2 I248XQBMf1zXc7iHKLRS+JM8SiuAy5C5dtcXox7Vs8PJAsUOnzAAE7ruWqbeNmFAIC+P vp9G4SfFCJKrQ/SgUowDZh1LqWfUa+qosYgOls10mC4Cmt+wltv+6hV06NqOmN9l6XfW oneox4vvNsfThs2bmvfkCNkNoEQ++ONeCup10lYg1nx3ATOc9F2DJEzqjZpwhy1lI1GH IiXvchLRN6UpZuP7nR15N+ViO3v0he13rdoGNUqGsNQyY4hM2iBCLfxm91zrjjY5+poW 1ZRw== X-Gm-Message-State: AFqh2kq0JWaV0q4vc3cPbgXzNQGANdmKpnLNOidc1auLdT1iysFjRZ7R dgbqXQMYXq9njy+Km36x0N8agtoWHJDdFrpu X-Google-Smtp-Source: AMrXdXsyhPfSBdxTv8IE0WRdIljwGIbr85OkKTrVa6U/tFCZkRM+bdcFqccwI14x7YR1RT63qBYuKw== X-Received: by 2002:a05:6512:2385:b0:4b5:90be:33c8 with SMTP id c5-20020a056512238500b004b590be33c8mr22875071lfv.48.1673388562825; Tue, 10 Jan 2023 14:09:22 -0800 (PST) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id f5-20020ac25085000000b0049313f77755sm2377456lfm.213.2023.01.10.14.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:09:22 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:09:11 +0300 Message-Id: <20230110220913.3528012-2-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220913.3528012-1-odivlad@gmail.com> References: <20230110220913.3528012-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Ilya Maximets , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-20.09 2/4] ci: Install wheel before installing any other python packages. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Ilya Maximets GHA is broken due to update to pip>=22.0. This happens because now it stops backtracking packages on build failure making it impossible to find working combination of versions. We're not able to build 'hacking', because 'wheel' is not installed at that point in time. Installing it separately to fix the issue, so pip can find compatible versions of packages by backtracking. Unfortunately, new version of backtracking leads to installation of incompatible versions of flake8 and hacking. Presumably because current versions of hacking are not compatible with flake8>=4.0 and very old hacking-0.5.4 for some reason is considered suitable while resolving dependencies. So, we end up with flake8-4.0.1 and hacking-0.5.4 installed. And that doesn't work. Limiting the version of hacking to >=3.0 to have flake8-3.9.2 and hacking-3.0.0 installed during backtracking. Signed-off-by: Ilya Maximets Acked-by: Dumitru Ceara [i.maximets: 2 tags below carried from v1, that had no >=3.0 change] Acked-by: Gaetan Rivet Acked-by: Aaron Conole Signed-off-by: Numan Siddique (cherry picked from OVS commit d5453008c419512ba5a31dade5d394984b6161a1) (cherry picked from commit 889037e2905447a601fab8f78e6ece46c5d45773) Signed-off-by: Vladislav Odintsov --- .ci/linux-prepare.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh index 37e8d4250..e0c528479 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh @@ -12,4 +12,10 @@ set -ev git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git cd sparse && make -j4 HAVE_LLVM= HAVE_SQLITE= install && cd .. -pip3 install --disable-pip-version-check --user flake8 hacking sphinx pyOpenSSL +# Installing wheel separately because it may be needed to build some +# of the packages during dependency backtracking and pip >= 22.0 will +# abort backtracking on build failures: +# https://github.com/pypa/pip/issues/10655 +pip3 install --disable-pip-version-check --user wheel +pip3 install --disable-pip-version-check --user \ + flake8 'hacking>=3.0' sphinx setuptools pyelftools pyOpenSSL From patchwork Tue Jan 10 22:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=BGMZvann; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ns4kk4p6Zz23gL for ; Wed, 11 Jan 2023 09:10:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D230361102; Tue, 10 Jan 2023 22:10:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D230361102 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=BGMZvann X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9Pn4X43ZX7C6; Tue, 10 Jan 2023 22:10:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id EA1D8610F8; Tue, 10 Jan 2023 22:10:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org EA1D8610F8 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 92405C007D; Tue, 10 Jan 2023 22:10:34 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 183A8C0080 for ; Tue, 10 Jan 2023 22:10:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 08D4E610BA for ; Tue, 10 Jan 2023 22:09:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 08D4E610BA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aFZhtfDWxaQR for ; Tue, 10 Jan 2023 22:09:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E88B561053 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by smtp3.osuosl.org (Postfix) with ESMTPS id E88B561053 for ; Tue, 10 Jan 2023 22:09:25 +0000 (UTC) Received: by mail-lf1-x131.google.com with SMTP id bt23so20599196lfb.5 for ; Tue, 10 Jan 2023 14:09:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hwc/9HYkpHzvN6ApCI9/03WzRRMWE3bxW1tJPy472W8=; b=BGMZvannQq+sjccBcxJuMa3d/JlYBYees/TdfUIH4KmJ98NBQF/giRXlKybd1GBryM TSpdQS+aG4d/gyhDVvk2w3R84oYzz1XJzM/GvK3jXiOVvr+Q7FeYtaD4xqFeoL53nfwD s0Q1vpWd7TEBbWrsO29UBPSQiwZjFqY5eHPZbiEDwbHh2MLLMhxVUzaSKrgjcpdqz3kS kafrvpprTap7Yvd2j50v1C9wdzNd4qH71dQ/qmoTMvL9PgGixQmNK2A6NtniaBskB0Yn elvpf7M360mtzGDTROibhkWh5M3nxsE00PH8PxH60kKgTgdakOcH/PC8yyDYOUYPsYMZ yR8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hwc/9HYkpHzvN6ApCI9/03WzRRMWE3bxW1tJPy472W8=; b=Yy9SoEBf3752BUYasTfbB4dWUzjhts0jqIDTZAU02weGlObk8jl6Zi4YICflA5dUOa B2x1xhQ05T6ZD3OUsc+aI2255FGvTea0BUBXG1PTgQtbIyLE+qHx/Pb+P37RUeUAcEth eNLRssv/Y3O8oY1EChIHnjQ0X8YZ3ln7VOs1Q5FxoaEst/ldRkmZMYFuL0JXm+CMTmJO etJm2Oce4azxL/LUJsbuEt2ffFcULkWXUNhhh6XHEAKG5zkxWgWzop5SspWDiPsfzvDg X9ZQYuVuc7RgLqX8ghd8EYmBKlejWFE5c5egEYiyUYjudOXGYKhO7dT4wHaNMl2CKvNn avGw== X-Gm-Message-State: AFqh2krVRETQn9RuRnN73Vx65dr5URs7ANy9unL3mLpEO9hXLHzGoxLr MHUrYnSMY/WiAwKAFRLZSzDwE/ZQcK+6qrYR X-Google-Smtp-Source: AMrXdXsWUPFGWGoVSmf/Er6N301z0V2I5RpaSWmlA4xqMBr9f+nD+zApPpfL2jLtPp3T4MnW+cNTrg== X-Received: by 2002:a05:6512:32d5:b0:4cc:73ff:579a with SMTP id f21-20020a05651232d500b004cc73ff579amr4026313lfg.38.1673388563713; Tue, 10 Jan 2023 14:09:23 -0800 (PST) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id f5-20020ac25085000000b0049313f77755sm2377456lfm.213.2023.01.10.14.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:09:23 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:09:12 +0300 Message-Id: <20230110220913.3528012-3-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220913.3528012-1-odivlad@gmail.com> References: <20230110220913.3528012-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-20.09 3/4] Fix compilation issue in fedora 37/rawhide. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Numan Siddique Compilation is failing with the error: File "Documentation/conf.py", line 61, in with open(filename, 'rU') as f: ^^^^^^^^^^^^^^^^^^^^ ValueError: invalid mode: 'rU' The python 3 documentation [1] says: There is an additional mode character permitted, 'U', which no longer has any effect, and is considered deprecated. It previously enabled universal newlines in text mode, which became the default behaviour in Python 3.0. Refer to the documentation of the newline parameter for further details. [1] - https://docs.python.org/3.9/library/functions.html#open This patch fixes this issue. Acked-by: Dumitru Ceara Signed-off-by: Numan Siddique (cherry picked from commit 500982b84280fdc451877c76f5fdb9a0ac19e805) Signed-off-by: Vladislav Odintsov --- Documentation/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/conf.py b/Documentation/conf.py index d89c64e77..f7eceaec8 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -58,7 +58,7 @@ author = u'The Open Virtual Network (OVN) Development Community' # The full version, including alpha/beta/rc tags. release = None filename = "../configure.ac" -with open(filename, 'rU') as f: +with open(filename, 'r') as f: for line in f: if 'AC_INIT' in line: # Parse "AC_INIT(openvswitch, 2.7.90, bugs@openvswitch.org)": From patchwork Tue Jan 10 22:09:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724375 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lUg7Rw5j; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ns4kn3MQ1z23fd for ; Wed, 11 Jan 2023 09:10:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6C03040C86; Tue, 10 Jan 2023 22:10:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6C03040C86 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lUg7Rw5j X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xsyC5dwDOVML; Tue, 10 Jan 2023 22:10:38 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8810140C72; Tue, 10 Jan 2023 22:10:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8810140C72 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 746C1C0081; Tue, 10 Jan 2023 22:10:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0475AC0033 for ; Tue, 10 Jan 2023 22:10:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F1C7660DFF for ; Tue, 10 Jan 2023 22:09:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F1C7660DFF Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lUg7Rw5j X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b7u0OU59elWT for ; Tue, 10 Jan 2023 22:09:27 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B3C36610A2 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by smtp3.osuosl.org (Postfix) with ESMTPS id B3C36610A2 for ; Tue, 10 Jan 2023 22:09:26 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id bf43so20656467lfb.6 for ; Tue, 10 Jan 2023 14:09:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=opfSiY4dhVHwsUTXsIXuukmv1wwMIqGwFqIe0ravtk0=; b=lUg7Rw5jUQAYuWkdck8WuyJujJrPsSmSVASNXL/NYWZMBXosl4K93QG5K9lJfY3j7u 4fP7iXrp7p56JnKiqDxY0cF/taNVXSss/WfNmFZ+zhwRj+f6WOUk4RiwR/8MbX13mEVx brFstrekG3UTgw8xclPhlTHRJVxAf0T2LtWTV8rEiJrut+QFyTAj1wakK0iaUAjlUPgt RFwYcVfaViJjQrUOPncNT6RqvZy2S88w9/C8iurgPAgfs814l/Lso4i86hZqWXaTNey/ B5SMolKzm7QtgaS/tkJ3CdoqATejU7dL106faBBjD2v1LqHVmEPgf/VvaH1lja2ngXUe D6UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=opfSiY4dhVHwsUTXsIXuukmv1wwMIqGwFqIe0ravtk0=; b=T+RuvWNVmAY+D3cohQ4qztS6rgG/CoqZT+2J5EginF8dtmElXzHCKlPKSwsR+z7r2A SZtt9eaL60V5b9gE3e/KW6QmXRfeAYLd6YWJ83wfU85KCk/rJzgQbukgkikhhiHAbRVH ydtzj79cTIZo2qMozTDYtssjFcuYbSCBFVyzI20W9G/mBSGi/nBqo572NHuFet/MkIT8 tWRHtE62TZWrZ1EOEqR2GykAd4/GMDAfJ9vasv9yD6Vgo/orK2qMaMSB/rA6mnYSTuRA BUUG/mVlDyQ9QkdMv9msMmHqtrTZo+Kf3DA7Lj5NJ5aaWxw8x73qwZLiV8XTY5aEwa7d pe+A== X-Gm-Message-State: AFqh2koPaH+ZmBLKNgUCmxrsUTxMRPSXdsaI2vfeABlNSNTypE7L2S2D wCbr+4g07a38mXa2HFi+H6ZD2ZlwiSZjHe/C X-Google-Smtp-Source: AMrXdXvMqmf2t0h99MM0QkBZwWF9+Yh6N++5UJojruiOixWUQtS6+D+w5k6ZvGG+aF3lz9TT6tWWhA== X-Received: by 2002:a05:6512:2528:b0:4b6:f22c:7dc9 with SMTP id be40-20020a056512252800b004b6f22c7dc9mr19423844lfb.57.1673388564533; Tue, 10 Jan 2023 14:09:24 -0800 (PST) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id f5-20020ac25085000000b0049313f77755sm2377456lfm.213.2023.01.10.14.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:09:24 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:09:13 +0300 Message-Id: <20230110220913.3528012-4-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220913.3528012-1-odivlad@gmail.com> References: <20230110220913.3528012-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov , Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-20.09 4/4] ovn-ic: Only monitor useful tables and columns. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Dumitru Ceara Signed-off-by: Dumitru Ceara Signed-off-by: Mark Michelson Acked-by: Mark Michelson (cherry picked from commit 2698e7811b41b00ac3b6544430a95be9ae700e23) Signed-off-by: Vladislav Odintsov --- ic/ovn-ic.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 103 insertions(+), 5 deletions(-) diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c index 0888344e2..53a06b8f5 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -1613,13 +1613,111 @@ main(int argc, char *argv[]) struct ovsdb_idl_loop ovnisb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER( ovsdb_idl_create(ovn_ic_sb_db, &icsbrec_idl_class, true, true)); - /* ovn-nb db. XXX: add only needed tables and columns */ + /* ovn-nb db. */ struct ovsdb_idl_loop ovnnb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER( - ovsdb_idl_create(ovnnb_db, &nbrec_idl_class, true, true)); - - /* ovn-sb db. XXX: add only needed tables and columns */ + ovsdb_idl_create(ovnnb_db, &nbrec_idl_class, false, true)); + + ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_nb_global); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, &nbrec_nb_global_col_name); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, &nbrec_nb_global_col_options); + + ovsdb_idl_add_table(ovnnb_idl_loop.idl, + &nbrec_table_logical_router_static_route); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_static_route_col_ip_prefix); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_static_route_col_nexthop); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_static_route_col_external_ids); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_static_route_col_options); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_static_route_col_policy); + + ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_router); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_col_name); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_col_static_routes); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_col_ports); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_col_options); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_col_external_ids); + + ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_router_port); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_port_col_name); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_port_col_networks); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_port_col_external_ids); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_router_port_col_options); + + ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_switch); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_col_name); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_col_ports); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_col_other_config); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_col_external_ids); + + ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_switch_port); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_name); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_addresses); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_options); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_type); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_up); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_addresses); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_enabled); + ovsdb_idl_add_column(ovnnb_idl_loop.idl, + &nbrec_logical_switch_port_col_external_ids); + + /* ovn-sb db. */ struct ovsdb_idl_loop ovnsb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER( - ovsdb_idl_create(ovnsb_db, &sbrec_idl_class, true, true)); + ovsdb_idl_create(ovnsb_db, &sbrec_idl_class, false, true)); + + ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_chassis); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_encaps); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_external_ids); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_name); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_hostname); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_other_config); + + ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_encap); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_chassis_name); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_type); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_ip); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_options); + + ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_datapath_binding); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_datapath_binding_col_external_ids); + + ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_port_binding); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_port_binding_col_datapath); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_port_binding_col_mac); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_port_binding_col_options); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_port_binding_col_logical_port); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_port_binding_col_external_ids); + ovsdb_idl_add_column(ovnsb_idl_loop.idl, + &sbrec_port_binding_col_chassis); /* Create IDL indexes */ struct ovsdb_idl_index *nbrec_ls_by_name