From patchwork Tue Jan 10 22:08: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: 1724369 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=gq0AwEQd; 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 4Ns4jw66TSz23g8 for ; Wed, 11 Jan 2023 09:09:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 18E6C81E91; Tue, 10 Jan 2023 22:09:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 18E6C81E91 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=gq0AwEQd 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 Awv10LYA_7db; Tue, 10 Jan 2023 22:09:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 29E0D8109A; Tue, 10 Jan 2023 22:09:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 29E0D8109A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F3B8CC0070; Tue, 10 Jan 2023 22:09:52 +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 C68F0C0070 for ; Tue, 10 Jan 2023 22:09:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 261516107A for ; Tue, 10 Jan 2023 22:08:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 261516107A 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=gq0AwEQd 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 PBjnClchWZ5J for ; Tue, 10 Jan 2023 22:08:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0AF4E61081 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0AF4E61081 for ; Tue, 10 Jan 2023 22:08:36 +0000 (UTC) Received: by mail-lf1-x12f.google.com with SMTP id m6so20623362lfj.11 for ; Tue, 10 Jan 2023 14:08:36 -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=gq0AwEQdUEyeunHkLXkNVZ9iPHu5OWecOX6JtyaFmmh8p6KsdT/Sz5TVxI/YczrgiH Xep8EaJwN+SvPTNMMdjradRuKNzdDYAJjkf66YX52XifLyvL/awHVZjbRTisMjoBwVR2 j+H3v0JWF1HOamd7DsjW4IcEnr1LItzvSyLni0F22O19MtXHQE9OkLGOX004tMEZQl0b O86c7fZHWoxbI8nFoRhYCN60O23v+BWmg8cpONxG9ZUaMvoIJ8wREMzhWSAdRwAoqZZ3 /44zRtVDma8CYlHlcOnk4GKDWY4sUDyVqKnSTMnELAT1ZpNVmQPnyLjQbKjVv2hF0wMv FcWg== 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=n+sRE4OerfHkWQ3/MXXdO8O5KR8E2WIDjVdeuRBTi9oXQ0/BE5scTEYrduqHmJOZvJ wj02ZqsM+zyxVcokhhLyfmnY0B9pJsLCfvXfUhCi/TfW0JaFS5ujpGVSKrwb4Twp+rqe bEh/2TuX4wHfXDXRlbCLnRivzV38qqSAtlyRb1yyo1agwZkZHBAhQ7LiWej58GAFdI2I 276zfWE7qIzfUSRCLKUpwGVhEVN+8w3P+PXUZmVThLWUA3Y9HdDzlVdISAlfwGl1wHFy +rBm/lU1B27lBmLeEseHdepG+H/X0b5CWMlI+MIxB8F/YNcZor/RKgOdXyAIvfDoGGti Z70Q== X-Gm-Message-State: AFqh2kp5fDMcSHON45dc/jgBojc75JngDGtgCk69sUUsVthQ/oqhizmm hJKga4MeQRwo++h+gxwb1IzIF9uG63VsTKYj X-Google-Smtp-Source: AMrXdXu2DH7J4jeFETX4hdlYOgcACrQlVE9qRMpDLuZH4g3QaqZwMx9zCrmN6uq+VtDQwY1xtnazcA== X-Received: by 2002:a05:6512:b0c:b0:4b5:97cf:8f1a with SMTP id w12-20020a0565120b0c00b004b597cf8f1amr23143164lfu.40.1673388514779; Tue, 10 Jan 2023 14:08: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 u10-20020a19790a000000b004cb1135953fsm2344686lfc.240.2023.01.10.14.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:08:34 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:08:29 +0300 Message-Id: <20230110220832.3527525-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.12 1/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:08:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724370 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=WpeK6V2J; 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 4Ns4kF5Ltjz23fY for ; Wed, 11 Jan 2023 09:10:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 40559418C0; Tue, 10 Jan 2023 22:10:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 40559418C0 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=WpeK6V2J 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 6z_aPn0gj9QW; Tue, 10 Jan 2023 22:10:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 18EE5402E5; Tue, 10 Jan 2023 22:10:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 18EE5402E5 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D5600C0033; Tue, 10 Jan 2023 22:10:08 +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 37CF5C0070 for ; Tue, 10 Jan 2023 22:10:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6E6C94029B for ; Tue, 10 Jan 2023 22:08:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6E6C94029B 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 23RDqsJL1q6N for ; Tue, 10 Jan 2023 22:08:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1FDA54180B Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1FDA54180B for ; Tue, 10 Jan 2023 22:08:37 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id bu8so20630705lfb.4 for ; Tue, 10 Jan 2023 14:08:37 -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=WpeK6V2J+PZigs3LL16ObYAMH/PxbIqHD9k9zFKjXp96yeWpQ2s9jsRWaho19MRlXE WSPWf0Y9Wf+MP7ZQGsgWWCe1WA+FO3svl5rThvvcUAStDu5eWJyc0byJFjzDvSBHdQWv jP24n6iQ7aiKfVdqrTfKrSei4dZRQqVY1ckzxJlXVigpJ2k5/kJsHuthA8m3xXTJZPkb 36hJRT2AmHNW+r4GHUGfqqZpHPsQ4dawJLzvnoSmx0sE96QrDQpSIQMXAJ9SeiZYEt1n zuqigJWx+o6HwRA6I8gVEgecO+spZgx/C+M8uLkzvdHNJkElXi5U5w2SdOlJW6iWFlON 1M8A== 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=H7v3hlbmi4xM5maR9/tkjQjH4kpHsyXfdt4At/40s2enAqVEsMrSuiZG64+UJRQ8RJ 7nEffap4pO6p+j/wLvuWOzr+pbIENC7zhLOk6iF423z2SUpywdGRcuR3lQirOxH7HUBG jSUbly6ZthyxLLdRen2274qipg/BT6XFlwK3/R5+uQgAngoot0BOkLEWP00ArQW+2Hq3 JwkCbpL94Zta8/iF/KwO19q6zCkPKbwfbIjKIIQhQHBThWKpYqqj7O+UJ1dS4Ln487/q vDb5vYHGonNV2Ec7o6PxwfQkV6K5S/uFZqNCVfILgJxHZv7Ng2T6uRmNyAuBNEjgM+Ei pAGw== X-Gm-Message-State: AFqh2krFQgufnbAFxBeqjNEZGQHsQjnesmJjikU5Eri/30UrrN4n8xkz o9gEW49vqfe68g6YIGiptbyQMgC6zQBTYUFl X-Google-Smtp-Source: AMrXdXsgz12DJs9rYExhuLuILgE+I7hvlg8ge7cMzsA350ahdzHWLNvpbYdJazTg8oZmQ5+u2goHRw== X-Received: by 2002:a05:6512:70a:b0:4c0:4214:cd2c with SMTP id b10-20020a056512070a00b004c04214cd2cmr17282895lfs.43.1673388515898; Tue, 10 Jan 2023 14:08:35 -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 u10-20020a19790a000000b004cb1135953fsm2344686lfc.240.2023.01.10.14.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:08:35 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:08:30 +0300 Message-Id: <20230110220832.3527525-2-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220832.3527525-1-odivlad@gmail.com> References: <20230110220832.3527525-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-20.12 2/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:08:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724368 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=Re9//+GK; 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 4Ns4jt04wBz23g8 for ; Wed, 11 Jan 2023 09:09:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3B1A340BC4; Tue, 10 Jan 2023 22:09:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3B1A340BC4 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=Re9//+GK 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 izRBOejNbTIj; Tue, 10 Jan 2023 22:09:51 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 6F54740BAA; Tue, 10 Jan 2023 22:09:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6F54740BAA Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 48EC2C0070; Tue, 10 Jan 2023 22:09:50 +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 6D42BC002D for ; Tue, 10 Jan 2023 22:09:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5FDF340BCE for ; Tue, 10 Jan 2023 22:08:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5FDF340BCE 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 Pyf_bgPBmKxj for ; Tue, 10 Jan 2023 22:08:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4A75240BC4 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 4A75240BC4 for ; Tue, 10 Jan 2023 22:08:39 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id f34so20610372lfv.10 for ; Tue, 10 Jan 2023 14:08:39 -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=0osPpLNbU5fGRP2g3YQO44ZSddUaVUWbZ89flfMgg5w=; b=Re9//+GKi6qdUXuAIPkGGIFDyrnSrudeOxd77RTvE4Zs3/GkNrph8RJbGsBNKouKrf IQz8/QVMrSU4m0FZA3r3/Q/liqP9LXFBA/jcNsrKJEH2K07xSGLJv1FUqWRIhUroG0pL TkaXXYYZnrm/LajTJdSkD1niZN5n3P4lpoltASrlycze55TyuCYUS3/1oKDdrncRYDsm f4rnNL2HdrH4L8Zwy3muBJFwaPOrbq/A3V6qamX3CoDiEju5vGd0gI1Y0+xXBnep2PtY ZodlE0qG8E35hVbwvOBwKaJrmnqQq1O5bzpXHrn6zMTKf8UVd62MdBPbOGELXPnRNKLX WpVw== 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=0osPpLNbU5fGRP2g3YQO44ZSddUaVUWbZ89flfMgg5w=; b=W9Lr5sqBaAob4fqThHaahM5WugEN+1EyV4XHWG7pqOs8bp/xaTC/2YCGlw0MDMnU6g gKPS/PGgn0SPpbYlHIa3+nwWMJa/VikcLbzhAFSxxt2kbx9U38QJQZBxsIbuzr56N2ol WrFVbFeuKSxETx79EdefOHixhcedZtDacMkSQZhkb5ZTghQNPo8XDcZ+7EGZHXZNLpNt /MwgXDTjIbe8oJsQBq9Liyy/X6H1KgSl1LmfNG3F+of4coQP4f73CwMMT3yrbT8iEg46 pd92u+VO5Nc9X/RmUni/1MIn34e+EncRy8Yi8t/mGftl7BB3ehbUNuyLNs3d1I8EK0Ym fZmg== X-Gm-Message-State: AFqh2kocg3Jknqhnvz342CMakiLNO9FjugGhykFgdFRNZG8+38PoeI2F 3sf0V8mXPRyqe3N4gbxcFXxPmn21m5ntTYHN X-Google-Smtp-Source: AMrXdXvU0q6NAhKUGCy7d4yI0WDSv/+sYp440QcUMI/3MiTAOnC3DnWMItbI3cuDJpD1H/tzJkJqfg== X-Received: by 2002:a05:6512:16a8:b0:4b5:a70f:8efc with SMTP id bu40-20020a05651216a800b004b5a70f8efcmr31080769lfb.64.1673388516990; Tue, 10 Jan 2023 14:08:36 -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 u10-20020a19790a000000b004cb1135953fsm2344686lfc.240.2023.01.10.14.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:08:36 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:08:31 +0300 Message-Id: <20230110220832.3527525-3-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220832.3527525-1-odivlad@gmail.com> References: <20230110220832.3527525-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn branch-20.12 3/4] ci: fix build: pin OVS to version 2.17 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" Signed-off-by: Vladislav Odintsov --- .ci/linux-build.sh | 1 + .ci/osx-build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 0e9f87fa8..4217b4365 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -11,6 +11,7 @@ function configure_ovs() { git clone https://github.com/openvswitch/ovs.git ovs_src pushd ovs_src + git checkout v2.17.0 ./boot.sh && ./configure $* || { cat config.log; exit 1; } make -j4 || { cat config.log; exit 1; } popd diff --git a/.ci/osx-build.sh b/.ci/osx-build.sh index 6617f0b9d..e256e54c2 100755 --- a/.ci/osx-build.sh +++ b/.ci/osx-build.sh @@ -9,6 +9,7 @@ function configure_ovs() { git clone https://github.com/openvswitch/ovs.git ovs_src pushd ovs_src + git checkout v2.17.0 ./boot.sh && ./configure $* make -j4 || { cat config.log; exit 1; } popd From patchwork Tue Jan 10 22:08:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1724371 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=H6cxHcP5; 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 4Ns4kJ2hxnz23gL for ; Wed, 11 Jan 2023 09:10:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CC1E481F76; Tue, 10 Jan 2023 22:10:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CC1E481F76 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=H6cxHcP5 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 qk3okWx96O5q; Tue, 10 Jan 2023 22:10:12 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id BBCDC81EAE; Tue, 10 Jan 2023 22:10:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BBCDC81EAE Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A6296C0078; Tue, 10 Jan 2023 22:10:10 +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 270E5C0033 for ; Tue, 10 Jan 2023 22:10:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BEDED418A6 for ; Tue, 10 Jan 2023 22:08:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BEDED418A6 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=H6cxHcP5 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 qNjnSUvNZv60 for ; Tue, 10 Jan 2023 22:08:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6D21E41834 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6D21E41834 for ; Tue, 10 Jan 2023 22:08:40 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id g13so20649742lfv.7 for ; Tue, 10 Jan 2023 14:08:40 -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=W8mMeUi41ezYbJ+nnU7f/tKjL/DNsitPI7860djg/n8=; b=H6cxHcP5YvPqOp5BpjXRGV26s5ejabMwQc/1ZNgbuIBb1joOkEjBZtJjcbsjSRqVjo xcqi1C4R8Is1eT7biw1OuF4qOeZd2ChAbtYJVmzlzJi4WYdmdtz9bdLSZHj+8uPk0IkO wgBcPM+OQBJ/PywmO4nie3yEoieRENDQ5Kl/QF2M1daYxEf7BzONamzlL2s77cnP3bxg hF86LHfXw5DY99OQOZvMGf484Z3w2PbdB7ka7S3manNO92LyjDoBAtiWFrendXXbifrS eRVOY3l/9upJ5h/D8apy0tkz+fTYh3ac9k4YH/ynHBtGICaFPa0pqOrNOor1qUmF8fPH /4ag== 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=W8mMeUi41ezYbJ+nnU7f/tKjL/DNsitPI7860djg/n8=; b=gf2FPX1jPsQmXK0rTjCjnrA78T1iYf7GN2WKDGWZ7QlOjP062rtAxbcp9tiZhCBX2I iHY7D7g4hOVulx1Jd/Gwf3uowGqBoGBFQ++Hd5dfAOphkoRmnEPNFi+zdJQX/ph4o9KJ D4DryeTZ/do/vH8BPKfH6jYaQpACmPzWWKnUiNJPJ6WAk6/jhBN4U9U5gmN5Vqg+0w4u PhnzXWacxU3x84TrxN9P0bs8UEulMQYH+Zz9TdQD7KYr5EEHR/YL+XXdCaITUbvskcio WM/dl5kDxqfv/6vqYUSSMclX0xmiUslly30Dvj/GDyWm7mc12wFlghY38A8I0k9uExEy zxEw== X-Gm-Message-State: AFqh2kr8YREUGTF7hMDVm1Eo8yjfgIdkL0YlRMCQ9Ne3LMXO42Bcm3eL pVsnM0ci6wB1F2grKA4QMLKTvd5ueWgQtfon X-Google-Smtp-Source: AMrXdXsyj9k7UFLfeS4DVuqaLs9+hyEhO3S7Kxx+0Hj3hrs0Vs/DTWKz3CKln6HSA7QfCLbGTAb1+A== X-Received: by 2002:a05:6512:684:b0:4cb:125:c5ae with SMTP id t4-20020a056512068400b004cb0125c5aemr15498667lfe.18.1673388518111; Tue, 10 Jan 2023 14:08:38 -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 u10-20020a19790a000000b004cb1135953fsm2344686lfc.240.2023.01.10.14.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:08:37 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Wed, 11 Jan 2023 01:08:32 +0300 Message-Id: <20230110220832.3527525-4-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230110220832.3527525-1-odivlad@gmail.com> References: <20230110220832.3527525-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov , Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-20.12 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 d7b1405d8..67a140c14 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -1633,13 +1633,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