From 2ec0c9d4ca2d8e1a005327013121e8a36a683360 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Mar 27 2025 20:35:43 +0000 Subject: Import openvswitch3.3-3.3.4-51 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 52717d8..8142b55 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -5234,7 +5234,7 @@ index 1cf4d5f7c9..818ef3a011 100644 } return; diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c -index f59d69c4d1..f6a80f1aec 100644 +index f59d69c4d1..ea02cd3a7a 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -3669,6 +3669,16 @@ mirror_set__(struct ofproto *ofproto_, void *aux, @@ -5272,12 +5272,12 @@ index f59d69c4d1..f6a80f1aec 100644 + const char *type = netdev_get_type_from_name(devname); + const struct ofport *ofport = + shash_find_data(&ofproto->up.port_by_name, devname); - -- ofport = shash_find_data(&ofproto->up.port_by_name, devname); ++ + if (!type && ofport && ofport->netdev) { + type = netdev_get_type(ofport->netdev); + } -+ + +- ofport = shash_find_data(&ofproto->up.port_by_name, devname); + if (type) { ofproto_port->ofp_port = ofport ? ofport->ofp_port : OFPP_NONE; ofproto_port->name = xstrdup(devname); @@ -5295,6 +5295,53 @@ index f59d69c4d1..f6a80f1aec 100644 if (n_hash > MAX_SELECT_GROUP_HASH_VALUES || (max_hash != 0 && n_hash > max_hash)) { VLOG_DBG(" Too many hash values required: %"PRIu64, n_hash); +@@ -5199,7 +5217,6 @@ group_set_selection_method(struct group_dpif *group) + const struct ofputil_group_props *props = &group->up.props; + const char *selection_method = props->selection_method; + +- VLOG_DBG("Constructing select group %"PRIu32, group->up.group_id); + if (selection_method[0] == '\0') { + VLOG_DBG("No selection method specified. Trying dp_hash."); + /* If the controller has not specified a selection method, check if +@@ -5266,6 +5283,7 @@ group_construct(struct ofgroup *group_) + group_construct_stats(group); + group->hash_map = NULL; + if (group->up.type == OFPGT11_SELECT) { ++ VLOG_DBG("Constructing select group %"PRIu32, group->up.group_id); + group_set_selection_method(group); + } + ovs_mutex_unlock(&group->stats_mutex); +@@ -5283,6 +5301,21 @@ group_destruct(struct ofgroup *group_) + } + } + ++static void ++group_modify(struct ofgroup *group_) ++{ ++ struct group_dpif *group = group_dpif_cast(group_); ++ ++ if (group->hash_map) { ++ free(group->hash_map); ++ group->hash_map = NULL; ++ } ++ if (group->up.type == OFPGT11_SELECT) { ++ VLOG_DBG("Modifying select group %"PRIu32, group->up.group_id); ++ group_set_selection_method(group); ++ } ++} ++ + static enum ofperr + group_get_stats(const struct ofgroup *group_, struct ofputil_group_stats *ogs) + { +@@ -6970,7 +7003,7 @@ const struct ofproto_class ofproto_dpif_class = { + group_construct, /* group_construct */ + group_destruct, /* group_destruct */ + group_dealloc, /* group_dealloc */ +- NULL, /* group_modify */ ++ group_modify, /* group_modify */ + group_get_stats, /* group_get_stats */ + get_datapath_version, /* get_datapath_version */ + get_datapath_cap, diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk index eba713bb6d..d484fe9deb 100644 --- a/ovsdb/automake.mk @@ -6359,6 +6406,22 @@ index 7d9b165d46..a8f8c067a9 100644 } @staticmethod +diff --git a/python/ovs/stream.py b/python/ovs/stream.py +index 82fbb0d688..935f63bbdc 100644 +--- a/python/ovs/stream.py ++++ b/python/ovs/stream.py +@@ -585,9 +585,9 @@ class PassiveStream(object): + if not PassiveStream.is_valid_name(name): + return errno.EAFNOSUPPORT, None + +- bind_path = name[6:] ++ bind_path = None + if name.startswith("punix:"): +- bind_path = ovs.util.abs_file_name(ovs.dirs.RUNDIR, bind_path) ++ bind_path = ovs.util.abs_file_name(ovs.dirs.RUNDIR, name[6:]) + if sys.platform != 'win32': + error, sock = ovs.socket_util.make_unix_socket( + socket.SOCK_STREAM, True, bind_path, None) diff --git a/python/ovs/tests/test_odp.py b/python/ovs/tests/test_odp.py index f19ec386e8..d514e9be32 100644 --- a/python/ovs/tests/test_odp.py @@ -6811,7 +6874,7 @@ index 55296e5593..0040a50b36 100644 AT_CHECK([ diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at -index e305e7b9cd..b89fe9559a 100644 +index e305e7b9cd..35b66e74f0 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -351,6 +351,49 @@ recirc_id(0),in_port(4),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=ff: @@ -6991,7 +7054,7 @@ index e305e7b9cd..b89fe9559a 100644 AT_SETUP([ofproto-dpif - group actions have no effect afterwards]) OVS_VSWITCHD_START add_of_ports br0 1 10 -@@ -1132,6 +1281,60 @@ bucket3 >= 500 +@@ -1132,6 +1281,153 @@ bucket3 >= 500 OVS_VSWITCHD_STOP AT_CLEANUP @@ -7049,10 +7112,103 @@ index e305e7b9cd..b89fe9559a 100644 +OVS_VSWITCHD_STOP +AT_CLEANUP + ++AT_SETUP([ofproto-dpif - select group with dp_hash, insert/remove buckets]) ++ ++OVS_VSWITCHD_START ++add_of_ports br0 1 10 ++ ++AT_CHECK([ovs-appctl vlog/set ofproto_dpif:file:dbg]) ++ ++dnl Add a group without buckets. ++AT_CHECK([ovs-ofctl -O OpenFlow15 add-group br0 \ ++ 'group_id=1235,type=select,selection_method=dp_hash']) ++AT_CHECK([grep -A3 "Constructing select group 1235" ovs-vswitchd.log \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Selection method specified: dp_hash. ++ofproto_dpif|DBG| Don't apply dp_hash method without buckets. ++ofproto_dpif|DBG|Falling back to default hash method. ++]) ++ ++m4_define([OFG_BUCKET], [bucket=weight=$1,bucket_id=$1,output:10]) ++ ++dnl Add two buckets one by one. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 insert-buckets br0 \ ++ group_id=1235,command_bucket_id=last,OFG_BUCKET([5])]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=16.00 hits=16 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=16.00 hits=16 ++]) ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 insert-buckets br0 \ ++ group_id=1235,command_bucket_id=last,OFG_BUCKET([6])]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG| Bucket 6: weight=6, target=16.00 hits=16 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=7.27 hits=7 ++ofproto_dpif|DBG| Bucket 6: weight=6, target=8.73 hits=9 ++]) ++dnl Add two more in the middle. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 insert-buckets br0 \ ++ group_id=1235,command_bucket_id=5,OFG_BUCKET([7]),OFG_BUCKET([8])]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG| Bucket 7: weight=7, target=7.47 hits=7 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=8.53 hits=9 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=3.08 hits=3 ++ofproto_dpif|DBG| Bucket 7: weight=7, target=4.31 hits=4 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=4.92 hits=5 ++ofproto_dpif|DBG| Bucket 6: weight=6, target=3.69 hits=4 ++]) ++dnl Remove the last bucket. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 remove-buckets br0 \ ++ group_id=1235,command_bucket_id=last]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=4.00 hits=4 ++ofproto_dpif|DBG| Bucket 7: weight=7, target=5.60 hits=6 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=6.40 hits=6 ++]) ++dnl Remove the one in the middle. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 remove-buckets br0 \ ++ group_id=1235,command_bucket_id=7]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=6.15 hits=6 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=9.85 hits=10 ++]) ++dnl Remove all the remaining. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 remove-buckets br0 \ ++ group_id=1235,command_bucket_id=all]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Modifying select group 1235 ++]) ++ ++OVS_VSWITCHD_STOP ++AT_CLEANUP ++ AT_SETUP([ofproto-dpif - select group with explicit dp_hash selection method]) OVS_VSWITCHD_START -@@ -5242,6 +5445,33 @@ AT_CHECK_UNQUOTED([tail -1 stdout], [0], +@@ -5242,6 +5538,33 @@ AT_CHECK_UNQUOTED([tail -1 stdout], [0], OVS_VSWITCHD_STOP AT_CLEANUP @@ -7086,7 +7242,7 @@ index e305e7b9cd..b89fe9559a 100644 AT_SETUP([ofproto-dpif - mirroring, OFPP_NONE ingress port]) AT_KEYWORDS([mirror mirrors mirroring]) OVS_VSWITCHD_START -@@ -6178,6 +6408,57 @@ AT_CHECK([test 1 = `$PYTHON3 "$top_srcdir/utilities/ovs-pcap.in" p2-tx.pcap | wc +@@ -6178,6 +6501,57 @@ AT_CHECK([test 1 = `$PYTHON3 "$top_srcdir/utilities/ovs-pcap.in" p2-tx.pcap | wc OVS_VSWITCHD_STOP AT_CLEANUP @@ -7144,7 +7300,7 @@ index e305e7b9cd..b89fe9559a 100644 AT_SETUP([ofproto-dpif - continuation with patch port]) AT_KEYWORDS([continuations pause resume]) OVS_VSWITCHD_START( -@@ -7653,12 +7934,14 @@ dummy@ovs-dummy: hit:0 missed:0 +@@ -7653,12 +8027,14 @@ dummy@ovs-dummy: hit:0 missed:0 vm1 5/3: (dummy: ifindex=2011) ]) @@ -7162,7 +7318,7 @@ index e305e7b9cd..b89fe9559a 100644 dnl Prime ARP Cache for 1.1.2.92 AT_CHECK([ovs-appctl netdev-dummy/receive p0 'recirc_id(0),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.92,tip=1.1.2.88,op=2,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)']) -@@ -7669,10 +7952,13 @@ ovs-vsctl \ +@@ -7669,10 +8045,13 @@ ovs-vsctl \ --id=@sf create sflow targets=\"127.0.0.1:$SFLOW_PORT\" agent=127.0.0.1 \ header=128 sampling=1 polling=0 @@ -7178,7 +7334,7 @@ index e305e7b9cd..b89fe9559a 100644 ]) dnl add rule for int-br to force packet onto tunnel. There is no ifindex -@@ -8935,6 +9221,7 @@ AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using +@@ -8935,6 +9314,7 @@ AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using ], []) AT_CHECK([ovs-appctl time/stop]) AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) @@ -7186,7 +7342,7 @@ index e305e7b9cd..b89fe9559a 100644 AT_CHECK([ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2]) AT_CHECK([ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3]) -@@ -9650,6 +9937,7 @@ m4_define([OFPROTO_DPIF_MEGAFLOW_DISABLED], +@@ -9650,6 +10030,7 @@ m4_define([OFPROTO_DPIF_MEGAFLOW_DISABLED], [AT_SETUP([ofproto-dpif megaflow - disabled$1]) OVS_VSWITCHD_START([], [], [], [m4_if([$1], [], [], [--dummy-numa="0,0,0,0,1,1,1,1"])]) AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) @@ -7194,7 +7350,7 @@ index e305e7b9cd..b89fe9559a 100644 func=`printf '%s_' "$1" | cut -c 4-` add_${func}of_ports br0 1 2 AT_DATA([flows.txt], [dnl -@@ -12041,3 +12329,48 @@ AT_CHECK([test 1 = `ovs-ofctl parse-pcap p2-tx.pcap | wc -l`]) +@@ -12041,3 +12422,48 @@ AT_CHECK([test 1 = `ovs-ofctl parse-pcap p2-tx.pcap | wc -l`]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -7496,7 +7652,7 @@ index 481afc08b3..9d8b4d06a4 100644 OVS_START_SHELL_HELPERS diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at -index fb568dd823..2c7c53f296 100644 +index fb568dd823..12b2c4fffc 100644 --- a/tests/ovsdb-idl.at +++ b/tests/ovsdb-idl.at @@ -167,8 +167,17 @@ m4_define([OVSDB_CHECK_IDL_REGISTER_COLUMNS_PY], @@ -7631,7 +7787,64 @@ index fb568dd823..2c7c53f296 100644 dnl This test creates database with weak references and checks that orphan dnl rows created for weak references are not available for iteration via dnl list of tracked changes. -@@ -1806,7 +1890,10 @@ OVSDB_CHECK_IDL_PARTIAL_UPDATE_MAP_COLUMN([map, simple2 idl-partial-update-map-c +@@ -1492,6 +1576,7 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, weak references, + {"op": "delete", + "table": "simple", + "where": [["s", "==", "row1_s"]]}]' \ ++ '+sleep' \ + '["idltest", + {"op": "insert", + "table": "simple", +@@ -1504,16 +1589,17 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, weak references, + 001: table simple: updated columns: s + 002: {"error":null,"result":[{"uuid":["uuid","<3>"]},{"count":1}]} + 003: {"error":null,"result":[{"count":1}]} +-004: table simple6: name=row0_s6 weak_ref=[<0>] uuid=<1> +-004: table simple6: updated columns: weak_ref +-004: table simple: inserted/deleted row: i=0 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-004: table simple: updated columns: s +-005: {"error":null,"result":[{"uuid":["uuid","<4>"]}]} +-006: table simple6: name=row0_s6 weak_ref=[<0>] uuid=<1> +-006: table simple: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> +-006: table simple: inserted row: i=0 r=0 b=false s=row2_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<4> +-006: table simple: updated columns: s +-007: done ++004: sleep ++005: table simple6: name=row0_s6 weak_ref=[<0>] uuid=<1> ++005: table simple6: updated columns: weak_ref ++005: table simple: inserted/deleted row: i=0 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++005: table simple: updated columns: s ++006: {"error":null,"result":[{"uuid":["uuid","<4>"]}]} ++007: table simple6: name=row0_s6 weak_ref=[<0>] uuid=<1> ++007: table simple: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> ++007: table simple: inserted row: i=0 r=0 b=false s=row2_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<4> ++007: table simple: updated columns: s ++008: done + ]]) + + dnl This test checks that deleting both the destination and source of the +@@ -1687,14 +1773,16 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially empty, strong references, in + '+["idltest", + {"op": "delete", + "table": "link2", +- "where": [["i", "==", 2]]}]' ++ "where": [["i", "==", 2]]}]' \ ++ '+sleep' + ]], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]} + 002: {"error":null,"result":[{"count":1}]} +-003: table link1: inserted row: i=1 k=1 ka=[] l2= uuid=<0> +-003: table link1: updated columns: i k +-004: done ++003: sleep ++004: table link1: inserted row: i=1 k=1 ka=[] l2= uuid=<0> ++004: table link1: updated columns: i k ++005: done + ]]) + + OVSDB_CHECK_IDL_TRACK([track, simple idl, initially empty, various ops], +@@ -1806,7 +1894,10 @@ OVSDB_CHECK_IDL_PARTIAL_UPDATE_MAP_COLUMN([map, simple2 idl-partial-update-map-c 007: name=String2 smap=[[key2 : value2]] imap=[[3 : myids2]] 008: After trying to delete a deleted element 009: name=String2 smap=[[key2 : value2]] imap=[[3 : myids2]] @@ -7643,7 +7856,7 @@ index fb568dd823..2c7c53f296 100644 ]]) OVSDB_CHECK_IDL_PY([partial-map idl], -@@ -1869,7 +1956,9 @@ OVSDB_CHECK_IDL_PARTIAL_UPDATE_SET_COLUMN([set, simple3 idl-partial-update-set-c +@@ -1869,7 +1960,9 @@ OVSDB_CHECK_IDL_PARTIAL_UPDATE_SET_COLUMN([set, simple3 idl-partial-update-set-c 009: table simple3: name=String2 uset=[<0>,<1>,<4>] uref=[] uuid=<2> 010: After add to other table + set of strong ref 011: table simple3: name=String2 uset=[<0>,<1>,<4>] uref=[<5>] uuid=<2> @@ -7654,7 +7867,7 @@ index fb568dd823..2c7c53f296 100644 ]]) OVSDB_CHECK_IDL_PY([partial-set idl], -@@ -2022,6 +2111,36 @@ OVSDB_CHECK_IDL_NOTIFY([simple idl verify notify], +@@ -2022,6 +2115,36 @@ OVSDB_CHECK_IDL_NOTIFY([simple idl verify notify], 015: done ]]) @@ -7691,7 +7904,75 @@ index fb568dd823..2c7c53f296 100644 # Tests to verify the functionality of the one column compound index. # It tests index for one column string and integer indexes. # The run of test-ovsdb generates the output of the display of data using the different indexes defined in -@@ -2707,7 +2826,7 @@ m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_C], +@@ -2636,6 +2759,7 @@ OVSDB_CHECK_IDL_TRACK([track, insert and delete, refs to link1], + "table": "link2", + "where": [["i", "==", 2]]} + ]' \ ++ '+sleep' \ + '["idltest", + {"op": "delete", + "table": "link2", +@@ -2645,15 +2769,16 @@ OVSDB_CHECK_IDL_TRACK([track, insert and delete, refs to link1], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]},{"uuid":["uuid","<2>"]}]} + 002: {"error":null,"result":[{"count":1}]} +-003: table link1: inserted row: i=1 k=1 ka=[] l2= uuid=<1> +-003: table link1: updated columns: i k +-003: table link2: inserted row: i=1 l1=1 uuid=<0> +-003: table link2: inserted/deleted row: i=2 l1=1 uuid=<2> +-003: table link2: updated columns: i l1 +-003: table link2: updated columns: i l1 +-004: {"error":null,"result":[{"count":1}]} +-005: table link1: i=1 k=1 ka=[] l2= uuid=<1> +-006: done ++003: sleep ++004: table link1: inserted row: i=1 k=1 ka=[] l2= uuid=<1> ++004: table link1: updated columns: i k ++004: table link2: inserted row: i=1 l1=1 uuid=<0> ++004: table link2: inserted/deleted row: i=2 l1=1 uuid=<2> ++004: table link2: updated columns: i l1 ++004: table link2: updated columns: i l1 ++005: {"error":null,"result":[{"count":1}]} ++006: table link1: i=1 k=1 ka=[] l2= uuid=<1> ++007: done + ]]) + OVSDB_CHECK_IDL_TRACK([track, insert and delete, refs to link2], + [], +@@ -2679,6 +2804,7 @@ OVSDB_CHECK_IDL_TRACK([track, insert and delete, refs to link2], + "table": "link1", + "where": [["i", "==", 2]]} + ]' \ ++ '+sleep' \ + '["idltest", + {"op": "delete", + "table": "link1", +@@ -2688,15 +2814,16 @@ OVSDB_CHECK_IDL_TRACK([track, insert and delete, refs to link2], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]},{"uuid":["uuid","<2>"]}]} + 002: {"error":null,"result":[{"count":1}]} +-003: table link1: inserted row: i=1 k=1 ka=[] l2=1 uuid=<0> +-003: table link1: inserted/deleted row: i=2 k=1 ka=[] l2=1 uuid=<2> +-003: table link1: updated columns: i k l2 +-003: table link1: updated columns: i k l2 +-003: table link2: inserted row: i=1 l1= uuid=<1> +-003: table link2: updated columns: i +-004: {"error":null,"result":[{"count":1}]} +-005: table link2: i=1 l1= uuid=<1> +-006: done ++003: sleep ++004: table link1: inserted row: i=1 k=1 ka=[] l2=1 uuid=<0> ++004: table link1: inserted/deleted row: i=2 k=1 ka=[] l2=1 uuid=<2> ++004: table link1: updated columns: i k l2 ++004: table link1: updated columns: i k l2 ++004: table link2: inserted row: i=1 l1= uuid=<1> ++004: table link2: updated columns: i ++005: {"error":null,"result":[{"count":1}]} ++006: table link2: i=1 l1= uuid=<1> ++007: done + ]]) + + m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_C], +@@ -2707,7 +2834,7 @@ m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_C], [0], [stdout], [stderr]) AT_CHECK([sort stdout], [0], [$3]) @@ -7700,7 +7981,7 @@ index fb568dd823..2c7c53f296 100644 OVSDB_SERVER_SHUTDOWN AT_CLEANUP]) -@@ -2719,7 +2838,7 @@ m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_PY], +@@ -2719,7 +2846,7 @@ m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_PY], [0], [stdout], [stderr]) AT_CHECK([sort stdout], [0], [$3]) @@ -7709,7 +7990,7 @@ index fb568dd823..2c7c53f296 100644 OVSDB_SERVER_SHUTDOWN AT_CLEANUP]) -@@ -2757,6 +2876,14 @@ OVSDB_CHECK_IDL_PERS_UUID_INSERT([simple idl, persistent uuid insert], +@@ -2757,6 +2884,14 @@ OVSDB_CHECK_IDL_PERS_UUID_INSERT([simple idl, persistent uuid insert], ]], [['This UUID would duplicate a UUID already present within the table or deleted within the same transaction']]) @@ -10355,7 +10636,7 @@ index 08d2cbaebf..4e9a3ab5c2 100644 mp.max_link = n - 1; multipath_execute(&mp, &flow, &wc); diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c -index c4ab899d45..8011850fdf 100644 +index c4ab899d45..6a0e0d8341 100644 --- a/tests/test-ovsdb.c +++ b/tests/test-ovsdb.c @@ -2023,6 +2023,24 @@ print_idl_row_updated_link2(const struct idltest_link2 *l2, int step) @@ -10501,7 +10782,17 @@ index c4ab899d45..8011850fdf 100644 } status = ovsdb_idl_txn_commit_block(txn); -@@ -2977,6 +3048,29 @@ do_idl_partial_update_map_column(struct ovs_cmdl_context *ctx) +@@ -2813,6 +2884,9 @@ do_idl(struct ovs_cmdl_context *ctx) + if (!strcmp(arg, "reconnect")) { + print_and_log("%03d: reconnect", step++); + ovsdb_idl_force_reconnect(idl); ++ } else if (!strcmp(arg, "sleep")) { ++ print_and_log("%03d: sleep", step++); ++ xsleep(1); + } else if (!strncmp(arg, remote_s, strlen(remote_s))) { + ovsdb_idl_set_remote(idl, arg + strlen(remote_s), true); + print_and_log("%03d: new remotes: %s, is connected: %s", step++, +@@ -2977,6 +3051,29 @@ do_idl_partial_update_map_column(struct ovs_cmdl_context *ctx) printf("%03d: After trying to delete a deleted element\n", step++); dump_simple2(idl, myRow, step++); @@ -10531,7 +10822,7 @@ index c4ab899d45..8011850fdf 100644 ovsdb_idl_destroy(idl); printf("%03d: End test\n", step); } -@@ -3075,6 +3169,21 @@ do_idl_partial_update_set_column(struct ovs_cmdl_context *ctx) +@@ -3075,6 +3172,21 @@ do_idl_partial_update_set_column(struct ovs_cmdl_context *ctx) ovsdb_idl_get_initial_snapshot(idl); printf("%03d: After add to other table + set of strong ref\n", step++); dump_simple3(idl, myRow, step++); diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index dd4345d..ac920f5 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.4 -Release: 50%{?dist} +Release: 51%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -794,6 +794,14 @@ exit 0 %endif %changelog +* Thu Mar 27 2025 Open vSwitch CI - 3.3.0-51 +- Merging upstream branch-3.3 [RH git: 95762cfdbd] + Commit list: + 90b5b99bc9 tests: ovsdb-idl: Fix flaky insert and delete tests. + 5e1162300f python: stream: Fix unlink attempt for ptcp IP address. + 0a8f6beb54 ofproto-dpif: Fix dp_hash mapping after select group modification. () + + * Tue Mar 18 2025 Open vSwitch CI - 3.3.0-50 - Merging redhat subtree [RH git: f079457421] Commit list: