From patchwork Tue Jan 10 22:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724364 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::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=GxGYMIih; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::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 4Ns4g93gWMz23g8 for ; Wed, 11 Jan 2023 09:07:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C723281EB1; Tue, 10 Jan 2023 22:07:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C723281EB1 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=GxGYMIih 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 facnrR_Rhyo5; Tue, 10 Jan 2023 22:07:30 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id CC5DA81EDB; Tue, 10 Jan 2023 22:07:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CC5DA81EDB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B9144C0033; Tue, 10 Jan 2023 22:07:28 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 50CF6C002D for ; Tue, 10 Jan 2023 22:07:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F01A741828 for ; Tue, 10 Jan 2023 22:07:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F01A741828 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=GxGYMIih 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 DOh8xgF7QTgT for ; Tue, 10 Jan 2023 22:07:00 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9F1684020C Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9F1684020C for ; Tue, 10 Jan 2023 22:06:59 +0000 (UTC) Received: by mail-lj1-x232.google.com with SMTP id f20so14071397lja.4 for ; Tue, 10 Jan 2023 14:06:59 -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=xPaSNwAmh+qtZ6/3qaerPfbZZH1r9tzYt8jDzB1nfPs=; b=GxGYMIih7hbcwCDsBv1V1nv8KcjlwKc9u351zrGdwnltq8k075fZnrgo9jvH7ezsG0 p+PKD2KcTu5kpCSRCQ4MTEUYEBS7+BoCvOwLqNCH3LXJR5h/ec+pwZ7x9a2Atx8Na58T NtgB8rj++NWBsIGnuYZeTQ6Jt+RsTYiWHdZrLVZJRcNkTRpIgzdw9rP5aatTKM9wUTii 7QnURYWIS2B/codFpxukUHbNs2fCdC1/YS4UvpbUnRlMTIm8TCJtnBAt0VQ0K3lWzFMH /22Pn6fXLJviZulOp4RUUs/WZm8+p4+l5fiRDXg8OjG3Y9uRNOBG2Ki8jaFFiwdUFZG2 jplA== 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=xPaSNwAmh+qtZ6/3qaerPfbZZH1r9tzYt8jDzB1nfPs=; b=J2WGwxAWngkrTGBY92qUsP2VvUYzF1Cqs6xNxIulmOeWEiZ/FSLO7Gkn2sMpyLJm+2 4B8aDpWITx3Cl3SAKwwnWBVLhl86H77IbKO5uFQeFARI2HcFlP6uhA6v77F+S3xC+ypM aIUuh0Bz5Mhbag+UO9brHYVhK9OkmUuidFnXmjV8dl3GepoP/h5mbT6Vs727SoHeNlJy 3p1JdfAVISAro9Ze1ySSjgw2T7JCHSW1JJCwItFQ7jNsGMavZHMf2Lyqcmzyth7mx9i7 bHh5QlzXL2xf6ChESvpqs8TJNNYCCeq90U+qeo88mjujM7IHyte1aN2/x7G8gzPSi8aK njQw== X-Gm-Message-State: AFqh2kogOyE0bsKws4I3geWzhJYCMHm6NAPSqyib9lrMe8zhn6TSMsqF Vrm+YoEhzv8K9j82HIm7cSSHF43DEL2ew6uP X-Google-Smtp-Source: AMrXdXuVtC/iarWA4m323HYn7HXC9yp0jsgG3ogS17JKhNCtlGgfidzlX4D7nftUOGjh70WKXbYsgw== X-Received: by 2002:a2e:a4a4:0:b0:27f:e162:15c3 with SMTP id g4-20020a2ea4a4000000b0027fe16215c3mr10929538ljm.48.1673388417232; Tue, 10 Jan 2023 14:06:57 -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 e6-20020a05651c038600b0028111f9f034sm1481515ljp.43.2023.01.10.14.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:06:56 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:06:53 +0300 Message-Id: <20230110220655.3526484-1-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Cc: Dumitru Ceara , Ilya Maximets , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-21.06 1/3] 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:06:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724362 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.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=BdZuHD78; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.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 4Ns4ft3DB2z23g8 for ; Wed, 11 Jan 2023 09:07:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A78DC41808; Tue, 10 Jan 2023 22:07:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A78DC41808 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=BdZuHD78 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 Lp6y5eC60mhO; Tue, 10 Jan 2023 22:07:14 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6E1C540259; Tue, 10 Jan 2023 22:07:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6E1C540259 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 43F7CC0070; Tue, 10 Jan 2023 22:07:13 +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 E5994C002D for ; Tue, 10 Jan 2023 22:07:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E53D2817AD for ; Tue, 10 Jan 2023 22:07:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E53D2817AD 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=BdZuHD78 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 9aeLaKXjMAwa for ; Tue, 10 Jan 2023 22:07:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C761E81E97 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by smtp1.osuosl.org (Postfix) with ESMTPS id C761E81E97 for ; Tue, 10 Jan 2023 22:07:00 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id y18so10535768ljk.11 for ; Tue, 10 Jan 2023 14:07:00 -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=BdZuHD78q580mUhitHVALnMl87Pg7KHMzkD4cefIabZ/vLFR9l9sUvSQz10pFNqzEr x5VxaO0/4n9O0sDObQDPg8XQinuHE4VfE/uCBk9MMZro9f/DfYiPOIAdGub5PbE5UqIw ILG6OTqYB2Mp5yBMcKXegaaq+AGApqoK+UVEJzW5t99CGZrAN2Iznw2aTxjjg4Pjm5jp 8uhbGtSRr0W/sjZ5o8rPY7E1kB0w15d83YP29N8f94mRtQTLBg1jfLlo51inWIR23Vc/ vQXyvTVSj0tIFuw4hrrdnPOw7H1Mtr0hGdp/dxgg/t6BuqBkY1HS4QaZ9E8wZTkatbJu AG8A== 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=kq/uAl63nbFeHBltEEdHzf79ILVqWvU64rUohAh7HNLr77rSogeIcw++RC+WVk5tVe YgVf6UAZW5+RtsX/XH+TAcYc4/UFPkpG0P1aQzgfnKGtBWvc5ZoEWjiWOIvooEmfI5Z0 oO9RcH5y4F8Rm3D1b/ZP6AS3d8PgeGglaC/4vYkeogWorPjHmFeosxBJjI4N74N3PVRS ysXfPJGlihVAdQqalUqdJ+pCriM3nZVymZMrD8GWW8wSUonPxhlhEz4PtPCRCz0mkpRm 9qfo/Qrp9Yc1klfpSMDUdmhlyJC2rcTtVoqMeTU+cdPX1150iC4D9N9fCWgf7sgXddnN kXGg== X-Gm-Message-State: AFqh2kqjTBznGbIeoX3U8cN7htrWxuITjEc081n0j6GgbCKQiiG1SCUC tRc0VJmNX+fYOmgjzENf/5b8RyV7o5AisF/B X-Google-Smtp-Source: AMrXdXvfwf4/VKAfsgNpD+D8w+w3HDPJh7B2uAgLPvPYq71Dg2oXcHHhVHOPT1H5hYqGuzX9nPUJkA== X-Received: by 2002:a05:651c:b21:b0:27f:fdde:ad36 with SMTP id b33-20020a05651c0b2100b0027ffddead36mr8911331ljr.17.1673388418554; Tue, 10 Jan 2023 14:06:58 -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 e6-20020a05651c038600b0028111f9f034sm1481515ljp.43.2023.01.10.14.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:06:58 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:06:54 +0300 Message-Id: <20230110220655.3526484-2-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220655.3526484-1-odivlad@gmail.com> References: <20230110220655.3526484-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-21.06 2/3] 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:06:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724363 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::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=cVX6zDlG; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::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 4Ns4g65h1hz23g8 for ; Wed, 11 Jan 2023 09:07:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1DB506108B; Tue, 10 Jan 2023 22:07:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1DB506108B 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=cVX6zDlG 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 gTX-kVqoq-_j; Tue, 10 Jan 2023 22:07:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 2A9F161085; Tue, 10 Jan 2023 22:07:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 2A9F161085 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 085D7C0033; Tue, 10 Jan 2023 22:07:27 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5A820C002D for ; Tue, 10 Jan 2023 22:07:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F19C361069 for ; Tue, 10 Jan 2023 22:07:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F19C361069 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 mUiYbw_smDwQ for ; Tue, 10 Jan 2023 22:07:02 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0417060648 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0417060648 for ; Tue, 10 Jan 2023 22:07:01 +0000 (UTC) Received: by mail-lj1-x233.google.com with SMTP id bx6so14098082ljb.3 for ; Tue, 10 Jan 2023 14:07:01 -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=HDByML1rPsDjmYBMpSayFMbJprXGpWPyfeNl9cgxnKU=; b=cVX6zDlGuedvXoPhSn5lEJ9i3cy+pYTrB0iz5liQ3l7+/BwwHwRp1KYg/48tzSMufe 4emeToV0PZ9IpYm58qp7oj8ZPyXj2JsxoMxoMBqzuDotyXVqGnMRooKs8IaLJstIARAs nwlvCCU1MDMwaQF/90wk3uUQMB9/7pjRr3RkYfDUvHkbjPnVFLl8R2qGhJzi+VX/aXbn 9NWapIeXIBgSXpvJ2079U5R/PkDdtJ+AfwPvXLfzB4NwBOmEYxA0BCVXT1AKd/iK7nRz E2iN1N3Ko9MvNRn5sIE5vY2WMvVV/aSgXzEQ9JkKSoQQ/2BdKzPU2vN5ZeXcZ0e2GHB+ rE6Q== 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=HDByML1rPsDjmYBMpSayFMbJprXGpWPyfeNl9cgxnKU=; b=D0cjQciNBw04URMbVm0/YVciISQVcnoG7uDKgUvDYS4dATnn7kyu91/OXK8z8QejOI RAoItTVTzex9IpTS4r74gFgWCH3e7xjp3SvzEfx89+aIW55crgL056Vb1KTD+1legkIC mggSXXAebf0CkIUkFYTgn9tzCkDc5rdUARrKPvc37RJXDD58hsbbBtzSKg319K+3gIxM ynNNxKMF+TDd9+4kaydEInH6he9chjC2KSmUSLZ7vX/Iia5sRFPq5sgEjOW8GU4YMi89 i5aISha47Ha75crmswaAiI66CyIWSmmhXjX09o2+9ZEPmOZLVVheXA28qEJ/dpm5g3Kr DRrA== X-Gm-Message-State: AFqh2kpGZEtxh3wv241PV0iGXNYBL3xjWNy9fkk1vFUPPZGUwckhczCY X8Kt37lTpEHAkY2Yqdibmwj7SOv7WjXg0rvv X-Google-Smtp-Source: AMrXdXvEEarBaQkj+iqbWMKa/jebrkJIs/r2GeMyoiA3JbLZI4Cu7c6k9PGSEZXaoh3pquHxCRF4EA== X-Received: by 2002:a2e:bf12:0:b0:27a:1098:6b82 with SMTP id c18-20020a2ebf12000000b0027a10986b82mr26041404ljr.42.1673388419755; Tue, 10 Jan 2023 14:06:59 -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 e6-20020a05651c038600b0028111f9f034sm1481515ljp.43.2023.01.10.14.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:06:59 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:06:55 +0300 Message-Id: <20230110220655.3526484-3-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220655.3526484-1-odivlad@gmail.com> References: <20230110220655.3526484-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov , Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-21.06 3/3] 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 77f1b03c6..84dfabf2e 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -1683,13 +1683,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