6ff7c75597
…(#12912) Why I did it As described in detail in #12753, the current FRR patch 0009-ignore-route-from-default-table.patch is causing unwanted FRR/zebra error logs. This change gets rid of the error messages for routes from kernel default table while these routes are ignored in prefix encoding. How I did it This fix updates the original 0009 patch by checking if the routes are from table default before printing the error logs. The original patch checks the same condition and ignores the routes from table default in prefix encoding. How to verify it Follow the steps to repro as described in #12753. Also verify the test case ipfwd/test_nhop_count.py no longer fails due to the error messages. #### Why I did it Resolve cherry-pick conflict for https://github.com/sonic-net/sonic-buildimage/pull/12912
60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
commit 8b78a43ba243df281f2096a84893ad87cb2a79ff
|
|
Author: Stephen Xu <stexu@linkedin.com>
|
|
Date: Wed Nov 16 16:07:37 2022 -0500
|
|
|
|
[PATCH] ignore route from default table
|
|
|
|
Signed-off-by: Stephen Xu <stexu@linkedin.com>
|
|
|
|
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
|
|
index 43958fdfd..de7e246d4 100644
|
|
--- a/zebra/zebra_fpm.c
|
|
+++ b/zebra/zebra_fpm.c
|
|
@@ -25,6 +25,7 @@
|
|
|
|
#include "log.h"
|
|
#include "libfrr.h"
|
|
+#include "rib.h"
|
|
#include "stream.h"
|
|
#include "thread.h"
|
|
#include "network.h"
|
|
@@ -1016,8 +1017,15 @@ static int zfpm_build_route_updates(void)
|
|
else
|
|
zfpm_g->stats.route_dels++;
|
|
} else {
|
|
- zlog_err("%s: Encoding Prefix: %pRN No valid nexthops",
|
|
- __func__, dest->rnode);
|
|
+ struct rib_table_info *table_info =
|
|
+ rib_table_info(rib_dest_table(dest));
|
|
+ if (table_info && table_info->table_id == RT_TABLE_DEFAULT) {
|
|
+ zfpm_debug("%s: Skip encoding default table prefix: %pRN",
|
|
+ __func__, dest->rnode);
|
|
+ } else {
|
|
+ zlog_err("%s: Encoding Prefix: %pRN No valid nexthops",
|
|
+ __func__, dest->rnode);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
|
|
--- a/zebra/zebra_fpm_netlink.c
|
|
+++ b/zebra/zebra_fpm_netlink.c
|
|
@@ -284,6 +284,14 @@ static int netlink_route_info_fill(struct netlink_route_info *ri, int cmd,
|
|
{
|
|
struct nexthop *nexthop;
|
|
|
|
+ struct rib_table_info *table_info =
|
|
+ rib_table_info(rib_dest_table(dest));
|
|
+
|
|
+ if (table_info->table_id == RT_TABLE_DEFAULT) {
|
|
+ zfpm_debug("%s: Discard default table route", __func__);
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
memset(ri, 0, sizeof(*ri));
|
|
|
|
ri->prefix = rib_dest_prefix(dest);
|
|
--
|
|
2.25.1
|
|
|