add support for distributed lrp bfd

Signed-off-by: zhangzujian <[email protected]>
kubeovn · Oct 30, 2024 · 234f3bc · 234f3bc
1 parent df87e13
commit 234f3bc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/controller/pinctrl.c b/controller/pinctrl.c
@@ -7561,6 +7561,15 @@ bfd_monitor_run(struct ovsdb_idl_txn *ovnsb_idl_txn,
             continue;
         }
 
+        if (smap_get_bool(&pb->external_ids, "distributed-bfd", false)) {
+            const char *chassis_name = smap_get(&bt->external_ids,
+                                                "chassis-name");
+            if (!chassis_name || strcmp(chassis_name, chassis->name)) {
+                continue;
+            }
+            goto handle_bfd;
+        }
+
         const char *peer_s = smap_get(&pb->options, "peer");
         if (!peer_s) {
             continue;
@@ -7582,6 +7591,7 @@ bfd_monitor_run(struct ovsdb_idl_txn *ovnsb_idl_txn,
             continue;
         }
 
+handle_bfd:
         entry = pinctrl_find_bfd_monitor_entry_by_port(
                 bt->dst_ip, bt->src_port);
         if (!entry) {

diff --git a/northd/northd.c b/northd/northd.c
@@ -10098,6 +10098,13 @@ build_bfd_update_sb_conf(const struct nbrec_bfd *nb_bt,
     if (min_rx != sb_bt->min_rx) {
         sbrec_bfd_set_min_rx(sb_bt, min_rx);
     }
+
+    struct smap ids = SMAP_INITIALIZER(&ids);
+    if (nb_bt->external_ids && !smap_is_empty(&nb_bt->external_ids)) {
+        smap_clone(&ids, &nb_bt->external_ids);
+    }
+    sbrec_bfd_set_external_ids(sb_bt, &ids);
+    smap_destroy(&ids);
 }
 
 /* RFC 5881 section 4
@@ -10178,6 +10185,13 @@ build_bfd_table(struct ovsdb_idl_txn *ovnsb_txn,
             int d_mult = nb_bt->n_detect_mult ? nb_bt->detect_mult[0]
                                               : BFD_DEF_DETECT_MULT;
             sbrec_bfd_set_detect_mult(sb_bt, d_mult);
+
+            struct smap ids = SMAP_INITIALIZER(&ids);
+            if (nb_bt->external_ids && !smap_is_empty(&nb_bt->external_ids)) {
+                smap_clone(&ids, &nb_bt->external_ids);
+            }
+            sbrec_bfd_set_external_ids(sb_bt, &ids);
+            smap_destroy(&ids);
         } else {
             if (strcmp(bfd_e->sb_bt->status, nb_bt->status)) {
                 if (!strcmp(nb_bt->status, "admin_down") ||