diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 75d0471..1c10709 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -59890,7 +59890,7 @@ index 1683ec8781..e7f7ea7a95 100644 #endif /* bond.h */ diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c -index fa8f6cd0e8..172a58cfb7 100644 +index fa8f6cd0e8..508d05c265 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -310,8 +310,8 @@ connmgr_destroy(struct connmgr *mgr) @@ -59960,7 +59960,36 @@ index fa8f6cd0e8..172a58cfb7 100644 &ofconn->monitors) { ofmonitor_destroy(monitor); } -@@ -1953,8 +1953,8 @@ static void +@@ -1649,6 +1649,8 @@ connmgr_send_table_status(struct connmgr *mgr, + } + } + ++COVERAGE_DEFINE(connmgr_async_unsent); ++ + /* Given 'pin', sends an OFPT_PACKET_IN message to each OpenFlow controller as + * necessary according to their individual configurations. */ + void +@@ -1656,6 +1658,7 @@ connmgr_send_async_msg(struct connmgr *mgr, + const struct ofproto_async_msg *am) + { + struct ofconn *ofconn; ++ bool sent = false; + + LIST_FOR_EACH (ofconn, connmgr_node, &mgr->conns) { + enum ofputil_protocol protocol = ofconn_get_protocol(ofconn); +@@ -1677,6 +1680,11 @@ connmgr_send_async_msg(struct connmgr *mgr, + am->pin.up.base.flow_metadata.flow.in_port.ofp_port, + msg, &txq); + do_send_packet_ins(ofconn, &txq); ++ sent = true; ++ } ++ ++ if (!sent) { ++ COVERAGE_INC(connmgr_async_unsent); + } + } + +@@ -1953,8 +1961,8 @@ static void ofservice_close_all(struct ofservice *ofservice) OVS_REQUIRES(ofproto_mutex) { diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 5904091..bb13827 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 114%{?dist} +Release: 115%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,12 @@ exit 0 %endif %changelog +* Tue Aug 15 2023 Open vSwitch CI - 2.17.0-115 +- Merging upstream branch-2.17 [RH git: 365eb6caeb] + Commit list: + a336ef7121 connmgr: Count unsent async messages. + + * Mon Aug 14 2023 Open vSwitch CI - 2.17.0-114 - Merging upstream branch-2.17 [RH git: 9f692d81e1] Commit list: