The following commit is required in order to fix ovn-controller's
conditional monitoring support for "optional" tables that potentially
are missing from the Southbound database:
1daced2cd0d2 ("ovsdb: Add support for filtering monitor requests in the IDL
layer.")
Other commits picked up with this bump that are relevant to OVN:
851989077875 ("ovsdb-cs: Fix resource leak in ovsdb_cs_parse_schema().")
1fceb28bc3c5 ("ofproto-dpif: Avoid race between recirc id free and the leak
check.")
0f11765975c3 ("netdev-linux: Add peer_ifindex in veth iface status.")
5861e66b8dfa ("packets: Add support for unicast ND NS compose.")
73fa3e72172c ("route-table: Only dump IPv4 and IPv6 routes.")
With 1fceb28bc3c5 ("ofproto-dpif: Avoid race between recirc id free and
the leak check.") picked up we can now also revert 7508d3d7ef0d ("tests:
Ignore 'recirc_id left allocated' false positive.") and remove all other
occurrences of OVN tests that ignore the OVS "recirc_id left allocated"
warning message.
Signed-off-by: Dumitru Ceara <[email protected]>
---
Note: this patch is required by:
https://patchwork.ozlabs.org/project/ovn/patch/5e96b4ac745eae47474e4de24b0a233e1fbbc33f.1782825391.git.lorenzo.bianc...@redhat.com/
---
controller/pinctrl.c | 4 ++--
controller/route-exchange-netlink.c | 6 ++++--
ovs | 2 +-
tests/ovn.at | 12 ++----------
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/controller/pinctrl.c b/controller/pinctrl.c
index fce1c4be09..4711fd48a8 100644
--- a/controller/pinctrl.c
+++ b/controller/pinctrl.c
@@ -5187,7 +5187,7 @@ send_self_originated_neigh_packet(struct rconn *swconn,
in6_addr_get_mapped_ipv4(local),
in6_addr_get_mapped_ipv4(target));
} else {
- compose_nd_ns(&packet, eth, local, target);
+ compose_nd_ns(&packet, true, eth, eth_addr_zero, local, target);
}
/* Inject GARP request. */
@@ -6569,7 +6569,7 @@ pinctrl_handle_nd_ns(struct rconn *swconn, const struct
flow *ip_flow,
hton128(flow_get_xxreg(&pin->flow_metadata.flow, 0));
memcpy(&ipv6_dst, &nexthop_be, sizeof ipv6_dst);
}
- compose_nd_ns(&packet, ip_flow->dl_src, &ipv6_src,
+ compose_nd_ns(&packet, true, ip_flow->dl_src, eth_addr_zero, &ipv6_src,
&ipv6_dst);
/* Reload previous packet metadata and set actions from userdata. */
diff --git a/controller/route-exchange-netlink.c
b/controller/route-exchange-netlink.c
index a9fd1f58a7..8f1615c4ec 100644
--- a/controller/route-exchange-netlink.c
+++ b/controller/route-exchange-netlink.c
@@ -340,7 +340,8 @@ re_nl_sync_routes(uint32_t table_id, const struct hmap
*routes,
.learned_routes = learned_routes,
.stale_routes = &stale_routes,
};
- route_table_dump_one_table(table_id, handle_route_msg, &data);
+ route_table_dump_one_table(table_id, AF_INET, handle_route_msg, &data);
+ route_table_dump_one_table(table_id, AF_INET6, handle_route_msg, &data);
int ret = re_nl_delete_stale_routes(table_id, &stale_routes);
@@ -385,7 +386,8 @@ re_nl_cleanup_routes(uint32_t table_id)
.learned_routes = NULL,
.stale_routes = &stale_routes,
};
- route_table_dump_one_table(table_id, handle_route_msg, &data);
+ route_table_dump_one_table(table_id, AF_INET, handle_route_msg, &data);
+ route_table_dump_one_table(table_id, AF_INET6, handle_route_msg, &data);
int ret = re_nl_delete_stale_routes(table_id, &stale_routes);
vector_destroy(&stale_routes);
diff --git a/ovs b/ovs
index bdb95cc192..ba8649c1c3 160000
--- a/ovs
+++ b/ovs
@@ -1 +1 @@
-Subproject commit bdb95cc1920d4ab66fe062a9470eeb33a51d33e2
+Subproject commit ba8649c1c3aec12a6f93877064c40d63ebbf3545
diff --git a/tests/ovn.at b/tests/ovn.at
index 79cbc9d244..c223a2514d 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -10401,11 +10401,7 @@ check ovn-nbctl --wait=hv set Logical_Switch_Port ln1 \
options:localnet_learn_fdb=true
test_arp_nd_localnet
-OVN_CLEANUP([hv1
-/left allocated/d
-], [hv2
-/left allocated/d
-])
+OVN_CLEANUP([hv1], [hv2])
AT_CLEANUP
])
@@ -25639,11 +25635,7 @@ OVS_WAIT_UNTIL(
'hv2/br-phys-1_n1-tx.pcap expected_empty' ],
[$at_diff -F'^---' exp rcv])
-OVN_CLEANUP([hv1
-/left allocated/d
-], [hv2
-/left allocated/d
-])
+OVN_CLEANUP([hv1], [hv2])
AT_CLEANUP
])
--
2.54.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
