From patchwork Tue Jan 10 22:07:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724366 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=UL2ltvX5; 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 4Ns4gy24kcz23g8 for ; Wed, 11 Jan 2023 09:08:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9907040BE0; Tue, 10 Jan 2023 22:08:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9907040BE0 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=UL2ltvX5 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 ALDEB5ricBTR; Tue, 10 Jan 2023 22:08:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id AA4C240BF9; Tue, 10 Jan 2023 22:08:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org AA4C240BF9 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8500EC0033; Tue, 10 Jan 2023 22:08:09 +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 17D0EC0070 for ; Tue, 10 Jan 2023 22:08:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 390D941863 for ; Tue, 10 Jan 2023 22:07:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 390D941863 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=UL2ltvX5 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 89OvF93YbmNW for ; Tue, 10 Jan 2023 22:07:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D31F04184F Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by smtp4.osuosl.org (Postfix) with ESMTPS id D31F04184F for ; Tue, 10 Jan 2023 22:07:33 +0000 (UTC) Received: by mail-lf1-x130.google.com with SMTP id cf42so20664546lfb.1 for ; Tue, 10 Jan 2023 14:07:33 -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=UL2ltvX599SvBraJxpkWyxcx7WsImWJSw4ZLQ84Q3vVS5BPgIcI7xmSUzAaIYrI9rm aJiT19UQcrZUUBi4SJ5ipt3XUouLUCtGaoZ5lPHeyfIcdgs+Q3qvgKNNJRhl9nsY9WCh FYmMGI9XrI28dPHYEskFIZ97aNTFhLHB+Y/TeB5Y2WoviPHEF6v4BAuoHhcJ1/VIKFE3 tvJHlBCO/8a5k0L9V4GxI7WL0ZkO3Qy9sPxZALah2AXu26601jMFhn4q5Vz/ulOm0t27 0/LfBExa9s2dhgR/ppwfCIwfLI3IDadJw77WLUDkEngf27Yd2mT7KCbJjHQQpYIExmXV wYTA== 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=3CdkhImtXZDi89PNce4ql6kEm4O5NbTZyLz4HUzV1wbb/rHJEOnOpYnIAKagMNKXLa PrlrqEtN2F3jodqkwHhSwQOCaTCIY/RhqYKe8VDDr523fM5REojxzdRiPFCpMXrRkXQq 9AEhMDJNmJZueG3l9/wu3Idc10V/yZNWfwMhaOebJCXxD0LpM6yzRpRdy8nYs0GBGbbW oFIB1tzRLmfowdCMd9KkCNIzP/+J2Yp5PLg8nR287ywFgs8glFzyDBsJs3kWWwxc+giN 6BaOv/ceOC2FXXiM6Wxj0JYwgjVZHQqNl6QFLQ6uswde8flvi0fGj7TzT+8IBm4E/n/8 W2ZQ== X-Gm-Message-State: AFqh2kqM1LKHNG+OmzuUmLl+os1OzJLDxHkbqPu0HtCzSCPb+iNG7sAq FQ1ZKE/3TJQb4pJu+Wu4dvrDlIOn4j6y8+Cx X-Google-Smtp-Source: AMrXdXvApmzBz8cAj0iWqr4UGdo8BEkLBaMjpZitoVo2DA3RKIbm7DWWAm2UMWD+XaWX7UVdd3dU7Q== X-Received: by 2002:a05:6512:2601:b0:4ca:f9e4:5cac with SMTP id bt1-20020a056512260100b004caf9e45cacmr19864955lfb.14.1673388451455; Tue, 10 Jan 2023 14:07:31 -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 v20-20020ac258f4000000b004c2e1d7d9a3sm2369417lfo.146.2023.01.10.14.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:07:31 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:07:27 +0300 Message-Id: <20230110220729.3526877-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.03 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:07:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724365 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=p712sXZT; 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 4Ns4gq4bs7z23g8 for ; Wed, 11 Jan 2023 09:08:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BB63181F38; Tue, 10 Jan 2023 22:08:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BB63181F38 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=p712sXZT 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 VnBUb4EcO1H3; Tue, 10 Jan 2023 22:08:04 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id DAFB581E9A; Tue, 10 Jan 2023 22:08:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DAFB581E9A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A81BFC002D; Tue, 10 Jan 2023 22:08:03 +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 D4141C002D for ; Tue, 10 Jan 2023 22:08:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 311BA6107B for ; Tue, 10 Jan 2023 22:07:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 311BA6107B 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=p712sXZT 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 Jk4CLsN_ZqM7 for ; Tue, 10 Jan 2023 22:07:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3013E6107D 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 3013E6107D for ; Tue, 10 Jan 2023 22:07:35 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id v25so20598415lfe.12 for ; Tue, 10 Jan 2023 14:07:34 -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=p712sXZTyvK4lhTcWRwKEjD+ogMSPNUDqoaygzPwCYAX7I626isOZrUzkR5rZQoojw q6BiBhyKZjCcumt/5cKlLHVmW6C0L+Y756lzukBKhulqld9fJg1pMf0yUWu1pUcZbrbL q6MO49zklpp4aKDDrFRkKdZXvJ6VExB690HP7qB+H9Bm/hiyemX25YsoVrhMgP8ziWuS oDcKbKAP0OET2EgbH3mX6FZhFf5H04zjCHSgdG9vKLHBd6puva3XVeXFUreWgf75/1sm Jvw2XgG7tvqXdOk0SaHCqg4SqEVxQ36wsnk99sLJX6UipY6xgGVPF6NkDJvhPvjnlaJE /fBg== 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=ReBzZL6PXUTDOgJua2TwqSfntI+R4NUi1+QZrq/dhA7y8yhVcq0VdiNRaWet/P4QjL SrbQC5DvWt/mlTrP/aKMJfaVMybhUBZnw8By+tBL1dGqVdAquxZp2ssiEyzw9wmhiBm8 GeQEdanwpIeLnz31bZopBPiolFAupjXKxFX+x9wJxe2DXdLOkpyAIU4zxSLZEO4ZzMNY guJJhbEq/cGDklcFjLlU2NYKSYHsO+P1UgzI4FFcyi/Jury4aqLVkALzqR2mi/ckBDjC SfsNQnHWjFXogT1O+KKecUTVHeCiGuqVfzxE/m1vPfa0jsbN2nQrF29j19ezt5shivi9 8RIA== X-Gm-Message-State: AFqh2koCKwcYCq1JIYStWBTkdJyKQ9bgn+c1IIvPxWEcPj+1DHtPDjNl K4ixOU6dvdujgD0tZRA0U//zhBoulLN1MlLV X-Google-Smtp-Source: AMrXdXsCQ/2iqpa6GnGxopE+6aaK4jy2tDRJK9nxn/ZLVIIHr+Lxid+u7VSQx+8w+Kf9gyAXNp76/w== X-Received: by 2002:a05:6512:2628:b0:4cb:35dd:e58d with SMTP id bt40-20020a056512262800b004cb35dde58dmr10711857lfb.10.1673388452619; Tue, 10 Jan 2023 14:07:32 -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 v20-20020ac258f4000000b004c2e1d7d9a3sm2369417lfo.146.2023.01.10.14.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:07:32 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:07:28 +0300 Message-Id: <20230110220729.3526877-2-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220729.3526877-1-odivlad@gmail.com> References: <20230110220729.3526877-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-21.03 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:07:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724367 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::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=MzZKPwiH; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::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 4Ns4h13ln1z23g8 for ; Wed, 11 Jan 2023 09:08:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C3C2640C0C; Tue, 10 Jan 2023 22:08:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C3C2640C0C 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=MzZKPwiH 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 o4kAQT1YA_yb; Tue, 10 Jan 2023 22:08:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8C45340BFC; Tue, 10 Jan 2023 22:08:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8C45340BFC Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 57661C002D; Tue, 10 Jan 2023 22:08:11 +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 17950C0033 for ; Tue, 10 Jan 2023 22:08:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 88C0D40BF0 for ; Tue, 10 Jan 2023 22:07:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 88C0D40BF0 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 ea-lPH9NLMHN for ; Tue, 10 Jan 2023 22:07:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8AA9240BEB Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8AA9240BEB for ; Tue, 10 Jan 2023 22:07:36 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id b3so20656647lfv.2 for ; Tue, 10 Jan 2023 14:07:36 -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=y/LZWa09p/2qgGHTe5v5rdGDLPdNigU0UR4k4p2m0Hs=; b=MzZKPwiHRzG/iFwsmt4sic04n5OUtw9dnv/BwH51iJBw3l6w/4RlANr9I1k3Kb3FQG lYVDtSoz0HQfhWKwd5ZLOKVL+ghUW9T5XSXlcjwvEEMhzvUmsgjUZ6Cimm2Cm8KgQjLM 1yATTQwJhEUM6Xk1RvqGkCtlO6fmr2rk+R5xTv3Ai8X8T6TaTeEhLiWOziB7zMqepR/x 69tbB7YfNF4/WD0BI7WRN+bUtvq2hKhF2ihNgPXY4+v6zqhQDflQsNdSNyfZg6K9PiKA tRY6oFnJYrFtT2ViGWy0VNXIZxHZA3fYL5SAurLkbAv/4414JJZHn+wJsUQKeFkVE00D JRHA== 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=y/LZWa09p/2qgGHTe5v5rdGDLPdNigU0UR4k4p2m0Hs=; b=bxqZXHwxZ260CAYsTlUH4/et6ORACsJ63Fc2xZxdFg5v+ox9PDNrupCP3/SlmHaFH7 rmA7jypd3o3MjPCrO/ShkJvVqBmLNQ7zzqTukBZek0yYHjKOnWAfIGxqG1ytOtgxK7NM 7QU7TJ+HPj3YfQrFIcQYq/hvLbWMloqP9/Se0T9B+43d768vHFkynj03FL+LnLFxKlgT 8zLAjf/9IIYbK8lAr5z4dsm7moligNON+KrLdd0D62ASGPCaWCLPtPOw7w6D5ihA2fFB lawn1o5U8XsQqv+C5VtG4Z3YqsgvxR3FtK06Ju+W1VKBLZJTALKzeaN3JlfiMKZEsbZd FlyQ== X-Gm-Message-State: AFqh2kpU4ZrO7R3zdJhc8HrJaDbEzt+zTjLMaZfrWw4k/1JaYhKECch9 D+dcHNN8b09w48zpNyV3+n/IzH8HqZygjB+x X-Google-Smtp-Source: AMrXdXv2SgfByZqj7o1aTFuOIZPaIOrKw3i1jElG5W4CCFoIWOUKSaiBwn7dHxmob1yWZ10U9KqE7w== X-Received: by 2002:a05:6512:3d94:b0:4a4:68b8:f4f4 with SMTP id k20-20020a0565123d9400b004a468b8f4f4mr25204358lfv.58.1673388454119; Tue, 10 Jan 2023 14:07:34 -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 v20-20020ac258f4000000b004c2e1d7d9a3sm2369417lfo.146.2023.01.10.14.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:07:33 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:07:29 +0300 Message-Id: <20230110220729.3526877-3-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220729.3526877-1-odivlad@gmail.com> References: <20230110220729.3526877-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov , Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-21.03 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 419d04ab8..69ee92d0b 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -1635,13 +1635,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