This reverts commit c9163c3046c5650c8b91f60728449483d4282165.
This depends on 85ca2b75369c ("northd: Don't skip transit switch LSP when
creating mcast groups.") which breaks inter-AZ use cases in
ovn-kubernetes deployments and will be reverted.
CC: Mohammad Heib <[email protected]>
Fixes: c9163c3046c5 ("IC: Tansit switch don't flood mcast traffic to router
ports if matches igmp group.")
Signed-off-by: Dumitru Ceara <[email protected]>
---
northd/northd.c | 17 +++--------------
northd/ovn-northd.8.xml | 14 +++++++-------
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/northd/northd.c b/northd/northd.c
index fd0dd83ba8..2629b0e21b 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -9505,16 +9505,8 @@ build_lswitch_destination_lookup_bmcast(struct
ovn_datapath *od,
}
-/* Ingress table 27: Add IP multicast flows learnt from IGMP/MLD
- * (priority 90).
- *
- * OR, for transit switches:
- *
- * Add IP multicast flows learnt from IGMP/MLD to forward traffic
- * explicitly to the ports that are part of the IGMP/MLD group,
- * and ignore MROUTER Ports.
- * (priority 90).
- */
+/* Ingress table 25: Add IP multicast flows learnt from IGMP/MLD
+ * (priority 90). */
static void
build_lswitch_ip_mcast_igmp_mld(struct ovn_igmp_group *igmp_group,
struct lflow_table *lflows,
@@ -9528,9 +9520,6 @@ build_lswitch_ip_mcast_igmp_mld(struct ovn_igmp_group
*igmp_group,
ds_clear(match);
ds_clear(actions);
- bool transit_switch =
- ovn_datapath_is_transit_switch(igmp_group->datapath);
-
struct mcast_switch_info *mcast_sw_info =
&igmp_group->datapath->mcast_info.sw;
uint64_t table_size = mcast_sw_info->table_size;
@@ -9576,7 +9565,7 @@ build_lswitch_ip_mcast_igmp_mld(struct ovn_igmp_group
*igmp_group,
}
/* Also flood traffic to all multicast routers with relay enabled. */
- if (mcast_sw_info->flood_relay && !transit_switch) {
+ if (mcast_sw_info->flood_relay) {
ds_put_cstr(actions,
"clone { "
"outport = \""MC_MROUTER_FLOOD "\"; "
diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml
index 3deaaa142d..91afe22b64 100644
--- a/northd/ovn-northd.8.xml
+++ b/northd/ovn-northd.8.xml
@@ -1956,13 +1956,13 @@ output;
</li>
<li>
- Priority-90 flows for non-transit switches that forward registered
- IP multicast traffic to their corresponding multicast group, which
- <code>ovn-northd</code> creates based on learnt
- <ref table="IGMP_Group" db="OVN_Southbound"/> entries. The flows
- also forward packets to the <code>MC_MROUTER_FLOOD</code> multicast
- group, which <code>ovn-nortdh</code> populates with all the logical
- ports that are connected to logical routers with
+ Priority-90 flows that forward registered IP multicast traffic to
+ their corresponding multicast group, which <code>ovn-northd</code>
+ creates based on learnt <ref table="IGMP_Group" db="OVN_Southbound"/>
+ entries. The flows also forward packets to the
+ <code>MC_MROUTER_FLOOD</code> multicast group, which
+ <code>ovn-nortdh</code> populates with all the logical ports that
+ are connected to logical routers with
<ref column="options" table="Logical_Router"/>:mcast_relay='true'.
</li>
--
2.44.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
