proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4554 from donaldsharp/nht_improved_debugging

Browse Source 
zebra: Display a bit better debugging for rnh tracking
This commit is contained in:
Mark Stapp 2019-06-19 09:02:26 -04:00 committed by GitHub
commit 8c86cd52be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/zebra_rib.c
View File

@ -744,9 +744,10 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
if (IS_ZEBRA_DEBUG_NHT_DETAILED) { if (IS_ZEBRA_DEBUG_NHT_DETAILED) {
char buf[PREFIX_STRLEN]; char buf[PREFIX_STRLEN];
zlog_debug("%s: %s Being examined for Nexthop Tracking", zlog_debug("%s: %s Being examined for Nexthop Tracking Count: %zd",
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
srcdest_rnode2str(rn, buf, sizeof(buf))); srcdest_rnode2str(rn, buf, sizeof(buf)),
dest ? rnh_list_count(&dest->nht) : 0);
} }
if (!dest) { if (!dest) {
rn = rn->parent; rn = rn->parent;
@ -769,11 +770,12 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
char buf1[PREFIX_STRLEN]; char buf1[PREFIX_STRLEN];
char buf2[PREFIX_STRLEN]; char buf2[PREFIX_STRLEN];
zlog_debug("%u:%s has Nexthop(%s) depending on it, evaluating %u:%u", zlog_debug("%u:%s has Nexthop(%s) Type: %s depending on it, evaluating %u:%u",
zvrf->vrf->vrf_id, zvrf->vrf->vrf_id,
srcdest_rnode2str(rn, buf1, srcdest_rnode2str(rn, buf1,
sizeof(buf1)), sizeof(buf1)),
prefix2str(p, buf2, sizeof(buf2)), prefix2str(p, buf2, sizeof(buf2)),
rnh_type2str(rnh->type),
seq, rnh->seqno); seq, rnh->seqno);
} }

27
zebra/zebra_rnh.c
View File

@ -160,14 +160,15 @@ struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid, rnh_type_t type,
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(p, buf, sizeof(buf)); prefix2str(p, buf, sizeof(buf));
zlog_debug("%u: Add RNH %s type %d", vrfid, buf, type); zlog_debug("%u: Add RNH %s type %s", vrfid, buf,
rnh_type2str(type));
} }
table = get_rnh_table(vrfid, afi, type); table = get_rnh_table(vrfid, afi, type);
if (!table) { if (!table) {
prefix2str(p, buf, sizeof(buf)); prefix2str(p, buf, sizeof(buf));
flog_warn(EC_ZEBRA_RNH_NO_TABLE, flog_warn(EC_ZEBRA_RNH_NO_TABLE,
"%u: Add RNH %s type %d - table not found", vrfid, "%u: Add RNH %s type %s - table not found", vrfid,
buf, type); buf, rnh_type2str(type));
exists = false; exists = false;
return NULL; return NULL;
} }
@ -271,8 +272,8 @@ static void zebra_delete_rnh(struct rnh *rnh, rnh_type_t type)
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
char buf[PREFIX2STR_BUFFER]; char buf[PREFIX2STR_BUFFER];
zlog_debug("%u: Del RNH %s type %d", rnh->vrf_id, zlog_debug("%u: Del RNH %s type %s", rnh->vrf_id,
rnh_str(rnh, buf, sizeof(buf)), type); rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type));
} }
zebra_free_rnh(rnh); zebra_free_rnh(rnh);
@ -293,9 +294,9 @@ void zebra_add_rnh_client(struct rnh *rnh, struct zserv *client,
{ {
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
char buf[PREFIX2STR_BUFFER]; char buf[PREFIX2STR_BUFFER];
zlog_debug("%u: Client %s registers for RNH %s type %d", vrf_id, zlog_debug("%u: Client %s registers for RNH %s type %s", vrf_id,
zebra_route_string(client->proto), zebra_route_string(client->proto),
rnh_str(rnh, buf, sizeof(buf)), type); rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type));
} }
if (!listnode_lookup(rnh->client_list, client)) if (!listnode_lookup(rnh->client_list, client))
listnode_add(rnh->client_list, client); listnode_add(rnh->client_list, client);
@ -312,9 +313,9 @@ void zebra_remove_rnh_client(struct rnh *rnh, struct zserv *client,
{ {
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
char buf[PREFIX2STR_BUFFER]; char buf[PREFIX2STR_BUFFER];
zlog_debug("Client %s unregisters for RNH %s type %d", zlog_debug("Client %s unregisters for RNH %s type %s",
zebra_route_string(client->proto), zebra_route_string(client->proto),
rnh_str(rnh, buf, sizeof(buf)), type); rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type));
} }
listnode_delete(rnh->client_list, client); listnode_delete(rnh->client_list, client);
zebra_delete_rnh(rnh, type); zebra_delete_rnh(rnh, type);
@ -803,8 +804,8 @@ static void zebra_rnh_evaluate_entry(struct zebra_vrf *zvrf, afi_t afi,
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN); prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN);
zlog_debug("%u:%s: Evaluate RNH, type %d %s", zvrf->vrf->vrf_id, zlog_debug("%u:%s: Evaluate RNH, type %s %s", zvrf->vrf->vrf_id,
bufn, type, force ? "(force)" : ""); bufn, rnh_type2str(type), force ? "(force)" : "");
} }
rnh = nrn->info; rnh = nrn->info;
@ -1156,9 +1157,9 @@ static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi,
struct rnh *rnh; struct rnh *rnh;
if (IS_ZEBRA_DEBUG_NHT) if (IS_ZEBRA_DEBUG_NHT)
zlog_debug("%u: Client %s RNH cleanup for family %s type %d", zlog_debug("%u: Client %s RNH cleanup for family %s type %s",
vrf_id, zebra_route_string(client->proto), vrf_id, zebra_route_string(client->proto),
afi2str(afi), type); afi2str(afi), rnh_type2str(type));
ntable = get_rnh_table(vrf_id, afi, type); ntable = get_rnh_table(vrf_id, afi, type);
if (!ntable) { if (!ntable) {

12
zebra/zebra_rnh.h
View File

@ -43,6 +43,18 @@ static inline int rnh_resolve_via_default(int family)
return 0; return 0;
} }
static inline const char *rnh_type2str(rnh_type_t type)
{
switch (type) {
case RNH_NEXTHOP_TYPE:
return "Nexthop";
case RNH_IMPORT_CHECK_TYPE:
return "Import";
}
return "ERROR";
}
extern struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid, extern struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid,
rnh_type_t type, bool *exists); rnh_type_t type, bool *exists);
extern struct rnh *zebra_lookup_rnh(struct prefix *p, vrf_id_t vrfid, extern struct rnh *zebra_lookup_rnh(struct prefix *p, vrf_id_t vrfid,