The northd I-P engine will run only if the DBs are writable that
makes those checks pointless.

Signed-off-by: Ales Musil <[email protected]>
---
 northd/aging.c            |  8 ++-----
 northd/en-global-config.c |  4 ----
 northd/en-northd.c        |  3 +--
 northd/en-sync-from-sb.c  |  2 +-
 northd/en-sync-sb.c       |  5 ----
 northd/northd.c           | 49 ++++++++++++++-------------------------
 northd/northd.h           |  4 +---
 7 files changed, 22 insertions(+), 53 deletions(-)

diff --git a/northd/aging.c b/northd/aging.c
index 32b21ff61..aa62a90dc 100644
--- a/northd/aging.c
+++ b/northd/aging.c
@@ -389,7 +389,6 @@ mac_binding_aging_run_for_datapath(const struct 
sbrec_datapath_binding *dp,
 enum engine_node_state
 en_mac_binding_aging_run(struct engine_node *node, void *data OVS_UNUSED)
 {
-    const struct engine_context *eng_ctx = engine_get_context();
     struct northd_data *northd_data = engine_get_input_data("northd", node);
     struct ed_type_global_config *global_config =
         engine_get_input_data("global_config", node);
@@ -397,8 +396,7 @@ en_mac_binding_aging_run(struct engine_node *node, void 
*data OVS_UNUSED)
     struct aging_waker *waker =
         engine_get_input_data("mac_binding_aging_waker", node);
 
-    if (!eng_ctx->ovnsb_idl_txn ||
-        !global_config->features.mac_binding_timestamp ||
+    if (!global_config->features.mac_binding_timestamp ||
         time_msec() < waker->next_wake_msec) {
         return EN_STALE;
     }
@@ -525,14 +523,12 @@ fdb_run_for_datapath(const struct sbrec_datapath_binding 
*dp,
 enum engine_node_state
 en_fdb_aging_run(struct engine_node *node, void *data OVS_UNUSED)
 {
-    const struct engine_context *eng_ctx = engine_get_context();
     struct northd_data *northd_data = engine_get_input_data("northd", node);
     struct aging_waker *waker = engine_get_input_data("fdb_aging_waker", node);
     struct ed_type_global_config *global_config =
         engine_get_input_data("global_config", node);
 
-    if (!eng_ctx->ovnsb_idl_txn ||
-        !global_config->features.fdb_timestamp ||
+    if (!global_config->features.fdb_timestamp ||
         time_msec() < waker->next_wake_msec) {
         return EN_STALE;
     }
diff --git a/northd/en-global-config.c b/northd/en-global-config.c
index ee5adfd3b..e7d6a7e66 100644
--- a/northd/en-global-config.c
+++ b/northd/en-global-config.c
@@ -67,10 +67,6 @@ enum engine_node_state
 en_global_config_run(struct engine_node *node , void *data)
 {
     const struct engine_context *eng_ctx = engine_get_context();
-    if (!eng_ctx->ovnnb_idl_txn || !eng_ctx->ovnsb_idl_txn) {
-        return EN_STALE;
-    }
-
     const struct nbrec_nb_global_table *nb_global_table =
         EN_OVSDB_GET(engine_get_input("NB_nb_global", node));
     const struct nbrec_logical_switch_table *nbrec_ls_table =
diff --git a/northd/en-northd.c b/northd/en-northd.c
index 8402ab943..011fb94c2 100644
--- a/northd/en-northd.c
+++ b/northd/en-northd.c
@@ -135,8 +135,7 @@ en_northd_run(struct engine_node *node, void *data)
 
     COVERAGE_INC(northd_run);
     stopwatch_start(OVNNB_DB_RUN_STOPWATCH_NAME, time_msec());
-    ovnnb_db_run(&input_data, data, eng_ctx->ovnnb_idl_txn,
-                 eng_ctx->ovnsb_idl_txn);
+    ovnnb_db_run(&input_data, data, eng_ctx->ovnsb_idl_txn);
     stopwatch_stop(OVNNB_DB_RUN_STOPWATCH_NAME, time_msec());
     return EN_UPDATED;
 }
diff --git a/northd/en-sync-from-sb.c b/northd/en-sync-from-sb.c
index b8aba7e2f..dde0e9f55 100644
--- a/northd/en-sync-from-sb.c
+++ b/northd/en-sync-from-sb.c
@@ -54,7 +54,7 @@ en_sync_from_sb_run(struct engine_node *node, void *data 
OVS_UNUSED)
     const struct sbrec_ha_chassis_group_table *sb_ha_ch_grp_table =
         EN_OVSDB_GET(engine_get_input("SB_ha_chassis_group", node));
     stopwatch_start(OVNSB_DB_RUN_STOPWATCH_NAME, time_msec());
-    ovnsb_db_run(eng_ctx->ovnnb_idl_txn, eng_ctx->ovnsb_idl_txn,
+    ovnsb_db_run(eng_ctx->ovnsb_idl_txn,
                  sb_pb_table, sb_ha_ch_grp_table,
                  &nd->ls_ports, &nd->lr_ports);
     stopwatch_stop(OVNSB_DB_RUN_STOPWATCH_NAME, time_msec());
diff --git a/northd/en-sync-sb.c b/northd/en-sync-sb.c
index 0a68d1d65..a111f14fd 100644
--- a/northd/en-sync-sb.c
+++ b/northd/en-sync-sb.c
@@ -406,11 +406,6 @@ en_sync_to_sb_pb_cleanup(void *data OVS_UNUSED)
 enum engine_input_handler_result
 sync_to_sb_pb_northd_handler(struct engine_node *node, void *data OVS_UNUSED)
 {
-    const struct engine_context *eng_ctx = engine_get_context();
-    if (!eng_ctx->ovnsb_idl_txn) {
-        return EN_UNHANDLED;
-    }
-
     struct northd_data *nd = engine_get_input_data("northd", node);
     if (!northd_has_tracked_data(&nd->trk_data) ||
             northd_has_lbs_in_tracked_data(&nd->trk_data)) {
diff --git a/northd/northd.c b/northd/northd.c
index 9b21786fa..cbfb8bf6b 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -10909,10 +10909,6 @@ bfd_table_sync(struct ovsdb_idl_txn *ovnsb_txn,
                const struct hmap *sr_bfd_connections,
                struct sset *bfd_ports)
 {
-    if (!ovnsb_txn) {
-        return;
-    }
-
     unsigned long *bfd_src_ports = bitmap_allocate(BFD_UDP_SRC_PORT_LEN);
     struct hmap sync_bfd_connections = HMAP_INITIALIZER(&sync_bfd_connections);
 
@@ -19439,12 +19435,8 @@ routes_destroy(struct routes_data *data)
 void
 ovnnb_db_run(struct northd_input *input_data,
              struct northd_data *data,
-             struct ovsdb_idl_txn *ovnnb_txn,
              struct ovsdb_idl_txn *ovnsb_txn)
 {
-    if (!ovnsb_txn || !ovnnb_txn) {
-        return;
-    }
     stopwatch_start(BUILD_LFLOWS_CTX_STOPWATCH_NAME, time_msec());
 
     use_ct_inv_match = smap_get_bool(input_data->nb_options,
@@ -19715,8 +19707,7 @@ handle_cr_port_binding_changes(const struct 
sbrec_port_binding *sb,
  * this column is not empty, it means we need to set the corresponding logical
  * port as 'up' in the northbound DB. */
 static void
-handle_port_binding_changes(struct ovsdb_idl_txn *ovnsb_txn,
-                const struct sbrec_port_binding_table *sb_pb_table,
+handle_port_binding_changes(const struct sbrec_port_binding_table *sb_pb_table,
                 const struct sbrec_ha_chassis_group_table *sb_ha_ch_grp_table,
                 struct hmap *ls_ports,
                 struct hmap *lr_ports,
@@ -19726,18 +19717,16 @@ handle_port_binding_changes(struct ovsdb_idl_txn 
*ovnsb_txn,
     const struct sbrec_port_binding *sb;
     bool build_ha_chassis_ref = false;
 
-    if (ovnsb_txn) {
-        const struct sbrec_ha_chassis_group *ha_ch_grp;
-        SBREC_HA_CHASSIS_GROUP_TABLE_FOR_EACH (ha_ch_grp, sb_ha_ch_grp_table) {
-            if (ha_ch_grp->n_ha_chassis > 1) {
-                struct ha_ref_chassis_info *ref_ch_info;
-
-                ref_ch_info = xzalloc(sizeof *ref_ch_info);
-                ref_ch_info->ha_chassis_group = ha_ch_grp;
-                hmapx_init(&ref_ch_info->ref_chassis);
-                build_ha_chassis_ref = true;
-                shash_add(ha_ref_chassis_map, ha_ch_grp->name, ref_ch_info);
-            }
+    const struct sbrec_ha_chassis_group *ha_ch_grp;
+    SBREC_HA_CHASSIS_GROUP_TABLE_FOR_EACH (ha_ch_grp, sb_ha_ch_grp_table) {
+        if (ha_ch_grp->n_ha_chassis > 1) {
+            struct ha_ref_chassis_info *ref_ch_info;
+
+            ref_ch_info = xzalloc(sizeof *ref_ch_info);
+            ref_ch_info->ha_chassis_group = ha_ch_grp;
+            hmapx_init(&ref_ch_info->ref_chassis);
+            build_ha_chassis_ref = true;
+            shash_add(ha_ref_chassis_map, ha_ch_grp->name, ref_ch_info);
         }
     }
 
@@ -19781,7 +19770,7 @@ handle_port_binding_changes(struct ovsdb_idl_txn 
*ovnsb_txn,
             sbrec_port_binding_set_up(op->sb, &up, 1);
         }
 
-        if (build_ha_chassis_ref && ovnsb_txn
+        if (build_ha_chassis_ref
             && (sb->chassis || sb->n_additional_chassis)) {
             /* Check and collect the chassis which has claimed this 'sb'
              * in relation to LR groups. */
@@ -19796,25 +19785,21 @@ handle_port_binding_changes(struct ovsdb_idl_txn 
*ovnsb_txn,
 
 /* Handle a fairly small set of changes in the southbound database. */
 void
-ovnsb_db_run(struct ovsdb_idl_txn *ovnnb_txn,
-             struct ovsdb_idl_txn *ovnsb_txn,
+ovnsb_db_run(struct ovsdb_idl_txn *ovnsb_txn,
              const struct sbrec_port_binding_table *sb_pb_table,
              const struct sbrec_ha_chassis_group_table *sb_ha_ch_grp_table,
              struct hmap *ls_ports,
              struct hmap *lr_ports)
 {
-    if (!ovnnb_txn ||
-        !ovsdb_idl_has_ever_connected(ovsdb_idl_txn_get_idl(ovnsb_txn))) {
+    if (!ovsdb_idl_has_ever_connected(ovsdb_idl_txn_get_idl(ovnsb_txn))) {
         return;
     }
 
     struct shash ha_ref_chassis_map = SHASH_INITIALIZER(&ha_ref_chassis_map);
-    handle_port_binding_changes(ovnsb_txn, sb_pb_table, sb_ha_ch_grp_table,
+    handle_port_binding_changes(sb_pb_table, sb_ha_ch_grp_table,
                                 ls_ports, lr_ports, &ha_ref_chassis_map);
-    if (ovnsb_txn) {
-        update_sb_ha_group_ref_chassis(sb_ha_ch_grp_table,
-                                       &ha_ref_chassis_map);
-    }
+    update_sb_ha_group_ref_chassis(sb_ha_ch_grp_table, &ha_ref_chassis_map);
+
     shash_destroy(&ha_ref_chassis_map);
 
     ovn_update_ipv6_prefix(lr_ports);
diff --git a/northd/northd.h b/northd/northd.h
index 084634328..299153d7e 100644
--- a/northd/northd.h
+++ b/northd/northd.h
@@ -823,10 +823,8 @@ find_route_outport(const struct hmap *lr_ports, const char 
*output_port,
 
 void ovnnb_db_run(struct northd_input *input_data,
                   struct northd_data *data,
-                  struct ovsdb_idl_txn *ovnnb_txn,
                   struct ovsdb_idl_txn *ovnsb_txn);
-void ovnsb_db_run(struct ovsdb_idl_txn *ovnnb_txn,
-                  struct ovsdb_idl_txn *ovnsb_txn,
+void ovnsb_db_run(struct ovsdb_idl_txn *ovnsb_txn,
                   const struct sbrec_port_binding_table *,
                   const struct sbrec_ha_chassis_group_table *,
                   struct hmap *ls_ports,
-- 
2.50.0

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to