From patchwork Thu Feb 18 08:09:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1441554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dh7Bz2YS3z9sRf for ; Thu, 18 Feb 2021 19:28:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 45257605EA for ; Thu, 18 Feb 2021 08:28:25 +0000 (UTC) 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 fWPaD_CPDZdk for ; Thu, 18 Feb 2021 08:28:23 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id 30B74605EE; Thu, 18 Feb 2021 08:28:23 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTP id 2030A60591; Thu, 18 Feb 2021 08:28:14 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C8269C000E; Thu, 18 Feb 2021 08:28:13 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0853DC000D for ; Thu, 18 Feb 2021 08:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F05AD86749 for ; Thu, 18 Feb 2021 08:28:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DAquio5FkXTb for ; Thu, 18 Feb 2021 08:28:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ti0189a330-0925.bb.online.no (ti0189a330-0925.bb.online.no [88.88.218.161]) by whitealder.osuosl.org (Postfix) with ESMTP id 3A8D3866B9 for ; Thu, 18 Feb 2021 08:27:40 +0000 (UTC) X-Mailbox-Line: From 8d93850d671218fd3737e8bd1b05e71d872be382 Mon Sep 17 00:00:00 2001 Message-Id: From: Frode Nordahl To: dev@openvswitch.org Date: Thu, 18 Feb 2021 09:09:20 +0100 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn branch-20.06 00/15] Backport rollup 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" Hello all, In Ubuntu we have backported a set of fixes to our OVN 20.06 and OVN 20.03 packages. In preparing for new point releases for OVN 20.06 and OVN 20.03, we would very much like to add these patches to the upstream branches. The issues solved for OVN 20.06 with these patches are: * Fix for upgrading database schema of clustered databases on package upgrade (LP: #1907081)[0] * Fixes for predictable resolution for conflicting flow actions. (LP: #1906922)[1] We are cognizant of the large number of patches required to cleanly backport the conflicting flow actions fixes, and have verified the end result thouroughly. From our experience these fixes are required to use OVN with OpenStack in a meaningful way, for example with k8s on top of OpenStack. 0: https://bugs.launchpad.net/bugs/1907081 1: https://bugs.launchpad.net/bugs/1906922 Dumitru Ceara (8): ofctrl.c: Only merge actions for conjunctive flows. ofctrl.c: Do not change flow ordering when merging opposite changes. ofctrl.c: Simplify active desired flow selection. ofctrl.c: Always log the most recent flow changes. ofctrl.c: Add a predictable resolution for conflicting flow actions. ovn.at: Make some of the tests more predictable. tests: Add ofctl_strip_all() to filter OVS flow outputs. tests: Fix test "ovn -- Superseding ACLs with conjunction". Han Zhou (6): ofctrl.c: Maintain references between installed flows and desired flows. ofctrl.c: Refactor - move openflow msg construction to functions. ofctrl: Incremental processing for flow installation by tracking. ofctrl.c: Merge opposite changes of tracked flows before installing. ofctrl.c: Fix duplicated flow handling in I-P while merging opposite changes. ofctrl.c: Avoid repeatedly linking an installed flow and a desired flow. Numan Siddique (1): ovn-ctl: Handle cluster db upgrades for run_(nb/sb)_ovsdb controller/ofctrl.c | 966 ++++++++++++++++++++++++++++++++-------- controller/ofctrl.h | 6 +- tests/ofproto-macros.at | 23 +- tests/ovn.at | 328 ++++++++++++++ utilities/ovn-ctl | 20 +- 5 files changed, 1156 insertions(+), 187 deletions(-)