bgpd: use bgp->name_pretty in debugs and add vrf to some output

Recently had a case where I was attempting to debug a nexthop tracking
issue across multiple bgp vrf's and since the setup vrf's in it with
overlapping address ranges, it became real fun real fast to track
vrf data associated.  Add a bit of code to allow us to figure out
what vrf we are in when we print out debug messages.

Look through the rest of the code and find debugs where we are
not using bgp->name_pretty and switch it over.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index 640224e75903c3aec609a458e34d5f58a45a7c44..f850cb49cf9979b0cce53a03edb67c7a33e72fef 100644 (file)
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -234,9 +234,9 @@ static void bgp_dump_routes_index_table(struct bgp *bgp)
        stream_put_in_addr(obuf, &bgp->router_id);
 
        /* View name */
-       if (bgp->name) {
-               stream_putw(obuf, strlen(bgp->name));
-               stream_put(obuf, bgp->name, strlen(bgp->name));
+       if (bgp->name_pretty) {
+               stream_putw(obuf, strlen(bgp->name_pretty));
+               stream_put(obuf, bgp->name_pretty, strlen(bgp->name_pretty));
        } else {
                stream_putw(obuf, 0);
        }

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 74c45ed447686f3c01570b38dbbf3e1f32c36370..915963fad81b9aa7c2f1def67fb2ec9d6e70594d 100644 (file)
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -91,8 +91,9 @@ static void bgp_unlink_nexthop_check(struct bgp_nexthop_cache *bnc)
        if (LIST_EMPTY(&(bnc->paths)) && !bnc->nht_info) {
                if (BGP_DEBUG(nht, NHT)) {
                        char buf[PREFIX2STR_BUFFER];
-                       zlog_debug("bgp_unlink_nexthop: freeing bnc %s",
-                                  bnc_str(bnc, buf, PREFIX2STR_BUFFER));
+                       zlog_debug("bgp_unlink_nexthop: freeing bnc %s(%s)",
+                                  bnc_str(bnc, buf, PREFIX2STR_BUFFER),
+                                  bnc->bgp->name_pretty);
                }
                unregister_zebra_rnh(bnc,
                                     CHECK_FLAG(bnc->flags, BGP_STATIC_ROUTE));
@@ -194,8 +195,9 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
                if (BGP_DEBUG(nht, NHT)) {
                        char buf[PREFIX2STR_BUFFER];
 
-                       zlog_debug("Allocated bnc %s peer %p",
-                                  bnc_str(bnc, buf, PREFIX2STR_BUFFER), peer);
+                       zlog_debug("Allocated bnc %s(%s) peer %p",
+                                  bnc_str(bnc, buf, PREFIX2STR_BUFFER),
+                                  bnc->bgp->name_pretty, peer);
                }
        }
 
@@ -291,16 +293,18 @@ void bgp_delete_connected_nexthop(afi_t afi, struct peer *peer)
                peer->bgp->nexthop_cache_table[family2afi(p.family)], &p);
        if (!rn) {
                if (BGP_DEBUG(nht, NHT))
-                       zlog_debug("Cannot find connected NHT node for peer %s",
-                                  peer->host);
+                       zlog_debug(
+                               "Cannot find connected NHT node for peer %s(%s)",
+                               peer->host, peer->bgp->name_pretty);
                return;
        }
 
        bnc = bgp_node_get_bgp_nexthop_info(rn);
        if (!bnc) {
                if (BGP_DEBUG(nht, NHT))
-                       zlog_debug("Cannot find connected NHT node for peer %s on route_node as expected",
-                                  peer->host);
+                       zlog_debug(
+                               "Cannot find connected NHT node for peer %s(%s) on route_node as expected",
+                               peer->host, peer->bgp->name_pretty);
                bgp_unlock_node(rn);
                return;
        }
@@ -309,8 +313,9 @@ void bgp_delete_connected_nexthop(afi_t afi, struct peer *peer)
        if (bnc->nht_info != peer) {
                if (BGP_DEBUG(nht, NHT))
                        zlog_debug(
-                               "Connected NHT %p node for peer %s points to %p",
-                               bnc, peer->host, bnc->nht_info);
+                               "Connected NHT %p node for peer %s(%s) points to %p",
+                               bnc, peer->host, bnc->bgp->name_pretty,
+                               bnc->nht_info);
                return;
        }
 
@@ -318,8 +323,9 @@ void bgp_delete_connected_nexthop(afi_t afi, struct peer *peer)
 
        if (LIST_EMPTY(&(bnc->paths))) {
                if (BGP_DEBUG(nht, NHT))
-                       zlog_debug("Freeing connected NHT node %p for peer %s",
-                                  bnc, peer->host);
+                       zlog_debug(
+                               "Freeing connected NHT node %p for peer %s(%s)",
+                               bnc, peer->host, bnc->bgp->name_pretty);
                unregister_zebra_rnh(bnc, 0);
                bgp_node_set_bgp_nexthop_info(bnc->node, NULL);
                bgp_unlock_node(bnc->node);
@@ -350,8 +356,8 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
 
        if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
                if (BGP_DEBUG(nht, NHT))
-                       zlog_debug("%s: Failure to decode nexthop update",
-                                  __PRETTY_FUNCTION__);
+                       zlog_debug("%s[%s]: Failure to decode nexthop update",
+                                  __PRETTY_FUNCTION__, bgp->name_pretty);
                return;
        }
 
@@ -368,8 +374,8 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
                if (BGP_DEBUG(nht, NHT)) {
                        char buf[PREFIX2STR_BUFFER];
                        prefix2str(&nhr.prefix, buf, sizeof(buf));
-                       zlog_debug("parse nexthop update(%s): rn not found",
-                                  buf);
+                       zlog_debug("parse nexthop update(%s(%s)): rn not found",
+                                  buf, bgp->name_pretty);
                }
                return;
        }
@@ -380,8 +386,9 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
                        char buf[PREFIX2STR_BUFFER];
 
                        prefix2str(&nhr.prefix, buf, sizeof(buf));
-                       zlog_debug("parse nexthop update(%s): bnc node info not found",
-                                  buf);
+                       zlog_debug(
+                               "parse nexthop update(%s(%s)): bnc node info not found",
+                               buf, bgp->name_pretty);
                }
                bgp_unlock_node(rn);
                return;
@@ -396,9 +403,10 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
                char buf[PREFIX2STR_BUFFER];
                prefix2str(&nhr.prefix, buf, sizeof(buf));
                zlog_debug(
-                       "%u: Rcvd NH update %s - metric %d/%d #nhops %d/%d flags 0x%x",
-                       vrf_id, buf, nhr.metric, bnc->metric, nhr.nexthop_num,
-                       bnc->nexthop_num, bnc->flags);
+                       "%s(%u): Rcvd NH update %s - metric %d/%d #nhops %d/%d flags 0x%x",
+                       bnc->bgp->name_pretty, vrf_id, buf, nhr.metric,
+                       bnc->metric, nhr.nexthop_num, bnc->nexthop_num,
+                       bnc->flags);
        }
 
        if (nhr.metric != bnc->metric)
@@ -622,7 +630,7 @@ static void sendmsg_zebra_rnh(struct bgp_nexthop_cache *bnc, int command)
                prefix2str(p, buf, PREFIX2STR_BUFFER);
                zlog_debug("%s: sending cmd %s for %s (vrf %s)",
                        __func__, zserv_command_string(command), buf,
-                       bnc->bgp->name);
+                       bnc->bgp->name_pretty);
        }
 
        ret = zclient_send_rnh(zclient, command, p, exact_match,
@@ -702,8 +710,9 @@ static void evaluate_paths(struct bgp_nexthop_cache *bnc)
                char buf[PREFIX2STR_BUFFER];
                bnc_str(bnc, buf, PREFIX2STR_BUFFER);
                zlog_debug(
-                       "NH update for %s - flags 0x%x chgflags 0x%x - evaluate paths",
-                       buf, bnc->flags, bnc->change_flags);
+                       "NH update for %s(%s) - flags 0x%x chgflags 0x%x - evaluate paths",
+                       buf, bnc->bgp->name_pretty, bnc->flags,
+                       bnc->change_flags);
        }
 
        LIST_FOREACH (path, &(bnc->paths), nh_thread) {
@@ -790,8 +799,9 @@ static void evaluate_paths(struct bgp_nexthop_cache *bnc)
 
        if (peer && !CHECK_FLAG(bnc->flags, BGP_NEXTHOP_PEER_NOTIFIED)) {
                if (BGP_DEBUG(nht, NHT))
-                       zlog_debug("%s: Updating peer (%s) status with NHT",
-                                  __FUNCTION__, peer->host);
+                       zlog_debug("%s: Updating peer (%s(%s)) status with NHT",
+                                  __FUNCTION__, peer->host,
+                                  peer->bgp->name_pretty);
                bgp_fsm_event_update(peer, bgp_isvalid_nexthop(bnc));
                SET_FLAG(bnc->flags, BGP_NEXTHOP_PEER_NOTIFIED);
        }