From patchwork Tue Jan 10 22:09:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724377 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=DUoXF0vD; 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 4Ns4lR5g2cz23fd for ; Wed, 11 Jan 2023 09:11:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 172108205C; Tue, 10 Jan 2023 22:11:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 172108205C 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=DUoXF0vD 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 00E8qX0xmRKH; Tue, 10 Jan 2023 22:11:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4A08F81FBB; Tue, 10 Jan 2023 22:11:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4A08F81FBB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 304FAC0033; Tue, 10 Jan 2023 22:11:12 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9ADD0C002D for ; Tue, 10 Jan 2023 22:11:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 155B940C0A for ; Tue, 10 Jan 2023 22:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 155B940C0A Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=DUoXF0vD 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 BQHqAcoRFuzY for ; Tue, 10 Jan 2023 22:10:06 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org F36C340C0E Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by smtp2.osuosl.org (Postfix) with ESMTPS id F36C340C0E for ; Tue, 10 Jan 2023 22:10:05 +0000 (UTC) Received: by mail-lf1-x131.google.com with SMTP id m6so20628142lfj.11 for ; Tue, 10 Jan 2023 14:10:05 -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=DUoXF0vDJWV8wUiE2zkvHekwGQmc71iYlR3aSNpQLdz0cFTJFu3WXh5/w+A4hwcJsi nxfSEVqrIbfuMCVRmQTcfq+R5dgDPrVqLcf/9MJHWAv7M+pMQCOVpR4ZjWbDnucqL7PP Y1a1TfBBzMrd2fTD2fQLphDII2+9QJN1LCSlXWLvlbdUZ8wphC68gcIPIm1geDXrNbcQ hz+RQ9P2q0472zmx1Q5NbSh4LBxUN/8By9vMc2b+3FpJxfzjdivY6lGSaJV+nUfY4F3A IPQluxKN60p2sKCTZGKzqmDed7QkyubpkObC00y8IXKbxEsCMx/61hS5+jQva/VmssgB Uq2Q== 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=NjUug6xXRvOVssVDONQzdoq3s6M5gfP2wkIFSONBiojOMNeG4L/VB9qwJOdiDPQ57M 3wkWuMlsRpsyRJSAVH04OtQr6b8u55Nfp4h8lILfPRccfJiux7UY2xvmgpxfUDfozP1R H87JbOBrMKspze75EZ/7iqrfjAtWt+j8N2Grdw4HvGviG7AgIfmCt08SuQTL43ydo4ya TqzCksmnwLCp/XVDKich+CPyqKGgPgTIqrZP95KHaSYYF7Hnrtlc7+lVN1LYscu5o6v8 nyPIy4QKSDqUk2l/ss2Td+u2UPW0PYUUp1V8u+DdALkjJyyKvlnKHo4s9PhS4d/wZTgO otIA== X-Gm-Message-State: AFqh2kojgS4sRVJULtXyZlBl4MRVh1oD4y7PilULG/ucj74dQmWYff4H P+479K9O0/hSxcC8znJgv9evtylxvw6LejdR X-Google-Smtp-Source: AMrXdXtKKTH/xZofHRR//wlA67rh0Cr5DsXC5ePUdjVWMthF/fXQgxyNktATZGjTlUC7p9J9ulcdUQ== X-Received: by 2002:a05:6512:3c2:b0:4cc:5e3a:dd82 with SMTP id w2-20020a05651203c200b004cc5e3add82mr5305201lfp.58.1673388603783; Tue, 10 Jan 2023 14:10:03 -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 s9-20020ac24649000000b004cb41b43c25sm2361856lfo.197.2023.01.10.14.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:10:03 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:09:59 +0300 Message-Id: <20230110221001.3528437-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-20.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:10:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724376 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=UW0mN4c0; 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 4Ns4l705KQz23fd for ; Wed, 11 Jan 2023 09:10:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F24C1419C5; Tue, 10 Jan 2023 22:10:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F24C1419C5 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=UW0mN4c0 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 8RHFyJKgtoX6; Tue, 10 Jan 2023 22:10:55 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id D6F9D41934; Tue, 10 Jan 2023 22:10:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D6F9D41934 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 87D27C0033; Tue, 10 Jan 2023 22:10:51 +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 25136C0070 for ; Tue, 10 Jan 2023 22:10:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 50B76812CC for ; Tue, 10 Jan 2023 22:10:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 50B76812CC 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=UW0mN4c0 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 2jjb7UqhnDba for ; Tue, 10 Jan 2023 22:10:07 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 31CD781EAE Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by smtp1.osuosl.org (Postfix) with ESMTPS id 31CD781EAE for ; Tue, 10 Jan 2023 22:10:07 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id j17so20659900lfr.3 for ; Tue, 10 Jan 2023 14:10:07 -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=UW0mN4c0LjJQY1eBv2EHWep1vfnqd56knMbKu09fGmOfruqIu4V0faz19xVDDBIgal RD1OUt6WjeGvM6XWJWuFksOOhtngMx7ZTTB8g4w76UQq03YSwL++40U6fMF+o/bWFQwC quDuI9GSc82vm0g9LDlVA/2P9wsNjQcZn21J56weYxpiC/z2HVOMcXHpl9tBFMNAa7IZ 0NutFNhOQ8gJY4y23v/9eSqH/v3fShY2X9pl+6vpBlhn26704xy9KuGfAJiSdyOKVeOC 9bbTC/m6DgYl9+h7I4POVtrY0If1dM0/0ZO8BpCqtzXBbikQIh0GQblAoQ8uv6QOhzMD WDqg== 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=joyQ9ZSSQua76IrwZpgv0v7eKERf2HsuXqTBC0BR1KJ768Tt5X/KFVnqPuvTp83MOl 6B3GRkFcoJEBXlXJQQC8UQ8lEe0YwHZeXqyhJwSlnJD3X77tyl+l7+eZwz0L/VSwobCs TPYbS/K4OqEWuyrkE3rDmBBxCbsAAQ0SdJGG5XyjyNjfnlung1zaK3EKc7Aiba+MLqhA Lkcj8YdJaM0+dFC2Uy75jbsIt+Guuje2G9RnfR4nHqwF0AzEaEXfWbbydajrwOFGBBTn 4aPmd4mjzBi4Fq56bHa3D6DMAYvGMkjiQWBIocdiW6wMuJXjxILcq/1bCtsyd9h9Awp0 sg+Q== X-Gm-Message-State: AFqh2kryw0bXKCTRgf5yIz2TQFgLPOT6iIH5cLjBz3Xp/hi0mMj9l/eX +VJYXswxIK1RRp5+O+1UhetEpc1Gf/lOTr/G X-Google-Smtp-Source: AMrXdXtgH5zlwztmFtNg8TafY19sw8IJi2nPyvctFLSOONyxyAycnJlGK9h7CzCipzzkj6YUUh/tNg== X-Received: by 2002:a05:6512:308d:b0:4a4:68b7:d61d with SMTP id z13-20020a056512308d00b004a468b7d61dmr20104546lfd.4.1673388604990; Tue, 10 Jan 2023 14:10:04 -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 s9-20020ac24649000000b004cb41b43c25sm2361856lfo.197.2023.01.10.14.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:10:04 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:10:00 +0300 Message-Id: <20230110221001.3528437-2-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110221001.3528437-1-odivlad@gmail.com> References: <20230110221001.3528437-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-20.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:10:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724378 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=VjBgdBo0; 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 4Ns4lh1dYMz23gL for ; Wed, 11 Jan 2023 09:11:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 86B7361185; Tue, 10 Jan 2023 22:11:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 86B7361185 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=VjBgdBo0 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 5OaIVNWK1F-d; Tue, 10 Jan 2023 22:11:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 8C891610AB; Tue, 10 Jan 2023 22:11:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8C891610AB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3A844C0078; Tue, 10 Jan 2023 22:11:24 +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 603D4C002D for ; Tue, 10 Jan 2023 22:11:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D7F02418BB for ; Tue, 10 Jan 2023 22:10:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D7F02418BB 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=VjBgdBo0 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 qGpSgAqT4Ydf for ; Tue, 10 Jan 2023 22:10:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9C27A41888 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9C27A41888 for ; Tue, 10 Jan 2023 22:10:08 +0000 (UTC) Received: by mail-lf1-x133.google.com with SMTP id y25so20645091lfa.9 for ; Tue, 10 Jan 2023 14:10:08 -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=p0WAhr4oVzjjTVtg5cIqYTiFwEB7D52PBmQyg8O/f5g=; b=VjBgdBo0yfJ8pSEQLuQwoWod2CCcUGoFtf90cPrUVNpIwoAUn8154IrTgQK7EokvRD e06vT6uOYl1Ns+5KpffZAXSN+qFRFB1xS7PizuhgiMX9qHC2uyig8fLhQAdUwoQzEiEp 54DjRcVooQbkUXBEHKh2RUDdstV0QaxBwocHD9PTDx/6Y4JjgwMddK4WOnb8Mo/ZCzPm mnd8xmsxpXMjRvULT/hEqWZhTP4ByKZQxhfq9LO2360qB2L7GJ2tk5dTSV1p25RAtegp jHoPJPVHAJZvJDnxB2IkwRFyt6/2RUIh0GYgCfdC7pJJ7McdCdY+RNE0m8MMdXkc8ytM Qasg== 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=p0WAhr4oVzjjTVtg5cIqYTiFwEB7D52PBmQyg8O/f5g=; b=nU92hrvsIET2I58LSOnB7VV32hxqVTdoWxdf3KANmUYF9oEQt0PJufxiy+5reGYSkr MMhEx+5jDfJpzPD5HSN2NHL/mfX/qBaj0afKzS04jQV7xwYp98H4rdLfmvkennTKlgwb y86CdabuoKyhiN5f8ln9TNPsSUp5VXtnjfL157VRxAD1QuDBBeOere5RgUJI3+0KVKk2 Acg8Yd1RWRhiA2EcTYsdqPShoKdEJi7c+vubGBNGbsVcJep6LeFajLKPTnS0KKJ0XgCX f/v3tOyTrZXhfTDSyRinkIrTR295MXb1hCe/53kErbnTxu2ATwxLmBkOinoV1UcBOZ2P NBmA== X-Gm-Message-State: AFqh2krohkRZZSYGlJyrKK+diDTcd4pE2Kj1GeDj+dyLKEP1OqXsrSVH DxvdNNSim4cORd5FotJ4Jwe6yKC5g/9vyTCr X-Google-Smtp-Source: AMrXdXvrGJv2cZ1yeakOnhENtWEypP3fNwUpyEoYsOQ2nCLEsQBldZZzMUKrNR3d4QXvh6bmsFBIuQ== X-Received: by 2002:a19:c20d:0:b0:4b5:b18b:8966 with SMTP id l13-20020a19c20d000000b004b5b18b8966mr17024980lfc.49.1673388606213; Tue, 10 Jan 2023 14:10:06 -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 s9-20020ac24649000000b004cb41b43c25sm2361856lfo.197.2023.01.10.14.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:10:05 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:10:01 +0300 Message-Id: <20230110221001.3528437-3-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110221001.3528437-1-odivlad@gmail.com> References: <20230110221001.3528437-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov , Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-20.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 | 106 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 101 insertions(+), 5 deletions(-) diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c index 0888344e2..788946ac8 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -1613,13 +1613,109 @@ 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_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