northd: Use uuid hash from source of parsed route.

Search by parsed route can be direct using uuid hash
from source (static route, learned route, connect
route), this avoids the search by ovn_datapath,
and after, the search for parsed route.

Signed-off-by: Lucas Vargas Dias <lucas.vdias@magalu.cloud>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
(cherry picked from commit 655f7bf)

Author: lucassdiass

northd/en-learned-route-sync.c

@@ -235,15 +235,9 @@ routes_table_sync(
 
 static struct parsed_route *
 find_learned_route(const struct sbrec_learned_route *learned_route,
-                   const struct ovn_datapaths *lr_datapaths,
                    const struct hmap *routes)
 {
-    const struct ovn_datapath *od = ovn_datapath_from_sbrec(
-        NULL, &lr_datapaths->datapaths, learned_route->datapath);
-    if (!od) {
-        return NULL;
-    }
-    return parsed_route_lookup_by_source(od, ROUTE_SOURCE_LEARNED,
+    return parsed_route_lookup_by_source(ROUTE_SOURCE_LEARNED,
                                          &learned_route->header_, routes);
 }
 
@@ -278,8 +272,7 @@ learned_route_sync_sb_learned_route_change_handler(struct engine_node *node,
 
         if (sbrec_learned_route_is_deleted(changed_route)) {
             struct parsed_route *route = find_learned_route(
-                changed_route, &northd_data->lr_datapaths,
-                &data->parsed_routes);
+                changed_route, &data->parsed_routes);
             if (!route) {
                 goto fail;
             }

northd/northd.c

@@ -11230,6 +11230,10 @@ parsed_route_lookup(struct hmap *routes, size_t hash,
             continue;
         }
 
+        if (pr->od != new_pr->od) {
+            continue;
+        }
+
         return pr;
     }
 
@@ -11297,15 +11301,14 @@ parsed_route_clone(const struct parsed_route *pr)
     return new_pr;
 }
 
-/* Searches for a parsed_route in a hmap based on datapath, source and
+/* Searches for a parsed_route in a hmap based on source and
  * source_hint. */
 struct parsed_route *
-parsed_route_lookup_by_source(const struct ovn_datapath *od,
-                              enum route_source source,
+parsed_route_lookup_by_source(enum route_source source,
                               const struct ovsdb_idl_row *source_hint,
                               const struct hmap *routes)
 {
-    size_t hash = uuid_hash(&od->key);
+    size_t hash = uuid_hash(&source_hint->uuid);
     struct parsed_route *route;
     HMAP_FOR_EACH_WITH_HASH (route, key_node, hash, routes) {
         if (route->source == source &&
@@ -11322,7 +11325,7 @@ parsed_route_lookup_by_source(const struct ovn_datapath *od,
  * This is distinct from route_hash which is stored in parsed_route->hash. */
 size_t
 parsed_route_hash(const struct parsed_route *pr) {
-    return uuid_hash(&pr->od->key);
+    return uuid_hash(&pr->source_hint->uuid);
 }
 
 void

northd/northd.h

@@ -825,8 +825,8 @@ struct parsed_route {
 
 struct parsed_route *parsed_route_clone(const struct parsed_route *);
 struct parsed_route *parsed_route_lookup_by_source(
-    const struct ovn_datapath *od, enum route_source source,
-    const struct ovsdb_idl_row *source_hint, const struct hmap *routes);
+    enum route_source source, const struct ovsdb_idl_row *source_hint,
+    const struct hmap *routes);
 size_t parsed_route_hash(const struct parsed_route *);
 void parsed_route_free(struct parsed_route *);