From 7a3b6498fca1b6179c0eaafdaa5811e6d8b68187 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 20 Jan 2024 20:25:59 -0500 Subject: [PATCH 1/2] zebra: Combine 2 debugs into 1 for NHG Detail When debugging NHG detail there is a whole bunch of lines surrounding the nexthop group. Let's clean these up since they are extremely chatty and spawn several lines. Signed-off-by: Donald Sharp --- zebra/zebra_nhg.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 9e3aa8bc5c..6804dbf13a 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -690,12 +690,6 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */ struct nhg_hash_entry *newnhe, *backup_nhe; struct nexthop *nh = NULL; - if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug( - "%s: id %u, lookup %p, vrf %d, type %d, depends %p%s", - __func__, lookup->id, lookup, lookup->vrf_id, - lookup->type, nhg_depends, - (from_dplane ? " (from dplane)" : "")); if (lookup->id) (*nhe) = zebra_nhg_lookup_id(lookup->id); @@ -703,7 +697,10 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */ (*nhe) = hash_lookup(zrouter.nhgs, lookup); if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug("%s: lookup => %p (%pNG)", __func__, *nhe, *nhe); + zlog_debug("%s: id %u, lookup %p, vrf %d, type %d, depends %p%s => Found %p(%pNG)", + __func__, lookup->id, lookup, lookup->vrf_id, + lookup->type, nhg_depends, + (from_dplane ? " (from dplane)" : ""), *nhe, *nhe); /* If we found an existing object, we're done */ if (*nhe) @@ -1537,13 +1534,11 @@ zebra_nhg_rib_find_nhe(struct nhg_hash_entry *rt_nhe, afi_t rt_afi) return NULL; } - if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug("%s: rt_nhe %p (%pNG)", __func__, rt_nhe, rt_nhe); - zebra_nhe_find(&nhe, rt_nhe, NULL, rt_afi, false); if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug("%s: => nhe %p (%pNG)", __func__, nhe, nhe); + zlog_debug("%s: rt_nhe %p(%pNG) => nhe %p(%pNG)", __func__, + rt_nhe, rt_nhe, nhe, nhe); return nhe; } From 827fb64ecb7ec22885fde2d256d4db8ede76e35d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 20 Jan 2024 20:36:25 -0500 Subject: [PATCH 2/2] zebra: Remove debugs for retrieving a new nhg id This is not complicated code and if zebra is allocating a new one. Zebra does not need to inform the operator about the process during debugs. Signed-off-by: Donald Sharp --- zebra/zebra_nhg.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 6804dbf13a..dc403b8111 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -72,25 +72,13 @@ static uint32_t nhg_get_next_id(void) while (1) { id_counter++; - if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug("%s: ID %u checking", __func__, id_counter); - if (id_counter == ZEBRA_NHG_PROTO_LOWER) { - if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug("%s: ID counter wrapped", __func__); - id_counter = 0; continue; } - if (zebra_nhg_lookup_id(id_counter)) { - if (IS_ZEBRA_DEBUG_NHG_DETAIL) - zlog_debug("%s: ID already exists", __func__); - - continue; - } - - break; + if (!zebra_nhg_lookup_id(id_counter)) + break; } return id_counter;