diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index c4d8c74..511ecd9 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -18694,6 +18694,19 @@ index 9e2d06b3dd..4e02425f7c 100644 } static inline void +diff --git a/lib/dpdk-stub.c b/lib/dpdk-stub.c +index b7d577870d..fe24f9abdf 100644 +--- a/lib/dpdk-stub.c ++++ b/lib/dpdk-stub.c +@@ -83,7 +83,7 @@ bool + dpdk_get_cpu_has_isa(const char *arch OVS_UNUSED, + const char *feature OVS_UNUSED) + { +- VLOG_ERR_ONCE("DPDK not supported in this version of Open vSwitch, " ++ VLOG_DBG_ONCE("DPDK not supported in this version of Open vSwitch, " + "cannot use CPU flag based optimizations"); + return false; + } diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 4381c618f1..3026a0619f 100644 --- a/lib/dpif-netdev.c @@ -21212,7 +21225,7 @@ index 8aec6bbac1..ba55566926 100644 from collections import Sequence, MutableSequence from functools import wraps diff --git a/python/ovs/db/idl.py b/python/ovs/db/idl.py -index 5850ac7abf..6cb5bef10b 100644 +index 5850ac7abf..3ca47f96bb 100644 --- a/python/ovs/db/idl.py +++ b/python/ovs/db/idl.py @@ -12,6 +12,7 @@ @@ -21418,6 +21431,18 @@ index 5850ac7abf..6cb5bef10b 100644 def __check_server_db(self): """Returns True if this is a valid server database, False otherwise.""" +@@ -1458,6 +1479,11 @@ class Transaction(object): + if self != self.idl.txn: + return self._status + ++ if self.idl.state != Idl.IDL_S_MONITORING: ++ self._status = Transaction.TRY_AGAIN ++ self.__disassemble() ++ return self._status ++ + # If we need a lock but don't have it, give up quickly. + if self.idl.lock_name and not self.idl.has_lock: + self._status = Transaction.NOT_LOCKED diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py index bf32f8c87c..d5127268aa 100644 --- a/python/ovs/jsonrpc.py diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index a30b852..15e3057 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 43%{?dist} +Release: 44%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,13 @@ exit 0 %endif %changelog +* Tue Oct 12 2021 Open vSwitch CI - 2.15.0-44 +- Merging upstream branch-2.15 [RH git: 3050e5222d] + Commit list: + 58397f222b dpdk-stub: Change the ERR log to DBG. + 2a963fc314 python: idl: Avoid sending transactions when the DB is not synced up. + + * Tue Oct 12 2021 Open vSwitch CI - 2.15.0-43 - Merging upstream branch-2.15 [RH git: 09e3ab3630] Commit list: