Skip to content

Commit f1dda4b

Browse files
Dmitrii Shcherbakovalmusil
authored andcommitted
controller: Remove Advertised_Route_Status table.
This reverts commit 7031ffc. Advertised_Route_Status has no current consumer. ovn-heater measurements also confirmed that publishing status rows adds Southbound database work. Remove the table while its consumers and scalability requirements are reconsidered. Signed-off-by: Dmitrii Shcherbakov <dmitrii.s@protonmail.com> Signed-off-by: Ales Musil <amusil@redhat.com>
1 parent 561c7f3 commit f1dda4b

18 files changed

Lines changed: 17 additions & 848 deletions

NEWS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
Post v26.03.0
22
-------------
3-
- New Southbound Advertised_Route_Status table has been added. This is used
4-
in order for ovn-controller instances to know the state of advertised
5-
routes amongst each other.
63
- Logical_Router_Port: Added a new "options:dhcpv4_primary_ip" key
74
that selects which of the port's IPv4 addresses ovn-northd uses as
85
the relay agent address (giaddr) in relayed DHCP packets. When

controller/chassis.c

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,26 +1181,14 @@ chassis_cleanup(struct ovsdb_idl_txn *ovs_idl_txn,
11811181
struct ovsdb_idl_txn *ovnsb_idl_txn,
11821182
const struct ovsrec_open_vswitch_table *ovs_table,
11831183
const struct sbrec_chassis *chassis_rec,
1184-
const struct sbrec_chassis_private *chassis_private_rec,
1185-
const struct sbrec_advertised_route_status_table *status_table)
1184+
const struct sbrec_chassis_private *chassis_private_rec)
11861185
{
1187-
const char *chassis_name = get_ovs_chassis_id(ovs_table);
1188-
bool has_route_status = false;
1189-
if (status_table && chassis_name) {
1190-
const struct sbrec_advertised_route_status *status;
1191-
SBREC_ADVERTISED_ROUTE_STATUS_TABLE_FOR_EACH (status, status_table) {
1192-
if (!strcmp(status->chassis_name, chassis_name)) {
1193-
has_route_status = true;
1194-
break;
1195-
}
1196-
}
1197-
}
1198-
11991186
if (!chassis_rec && !chassis_private_rec &&
1200-
!is_chassis_idx_stored(ovs_table) && !has_route_status) {
1187+
!is_chassis_idx_stored(ovs_table)) {
12011188
return true;
12021189
}
12031190

1191+
const char *chassis_name = get_ovs_chassis_id(ovs_table);
12041192
if (ovs_idl_txn) {
12051193
ovsdb_idl_txn_add_comment(
12061194
ovs_idl_txn,
@@ -1219,15 +1207,6 @@ chassis_cleanup(struct ovsdb_idl_txn *ovs_idl_txn,
12191207
if (chassis_private_rec) {
12201208
sbrec_chassis_private_delete(chassis_private_rec);
12211209
}
1222-
if (status_table && chassis_name) {
1223-
const struct sbrec_advertised_route_status *status;
1224-
SBREC_ADVERTISED_ROUTE_STATUS_TABLE_FOR_EACH_SAFE (
1225-
status, status_table) {
1226-
if (!strcmp(status->chassis_name, chassis_name)) {
1227-
sbrec_advertised_route_status_delete(status);
1228-
}
1229-
}
1230-
}
12311210
}
12321211
return false;
12331212
}

controller/chassis.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ struct ovsrec_open_vswitch_table;
2929
struct sbrec_chassis;
3030
struct sbrec_chassis_table;
3131
struct sbrec_chassis_private_table;
32-
struct sbrec_advertised_route_status_table;
3332
struct sset;
3433
struct eth_addr;
3534
struct smap;
@@ -51,8 +50,7 @@ bool chassis_cleanup(struct ovsdb_idl_txn *ovs_idl_txn,
5150
struct ovsdb_idl_txn *ovnsb_idl_txn,
5251
const struct ovsrec_open_vswitch_table *,
5352
const struct sbrec_chassis *,
54-
const struct sbrec_chassis_private *,
55-
const struct sbrec_advertised_route_status_table *);
53+
const struct sbrec_chassis_private *);
5654
bool chassis_get_mac(const struct sbrec_chassis *chassis,
5755
const char *bridge_mapping,
5856
struct eth_addr *chassis_mac);

0 commit comments

Comments
 (0)