*: make failure to decode nht update an error

This should never happen; no need to debug guard it and it's not a
warning, if this isn't working then NHT is not working at all.

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
This commit is contained in:
Quentin Young 2020-09-30 18:37:15 -04:00
parent 2fec17cd04
commit 6c83ddedcf
5 changed files with 7 additions and 11 deletions

View File

@ -441,9 +441,8 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
} }
if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) { if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
if (BGP_DEBUG(nht, NHT)) zlog_err("%s[%s]: Failure to decode nexthop update",
zlog_debug("%s[%s]: Failure to decode nexthop update", __PRETTY_FUNCTION__, bgp->name_pretty);
__PRETTY_FUNCTION__, bgp->name_pretty);
return; return;
} }

View File

@ -401,7 +401,7 @@ static int pbr_zebra_nexthop_update(ZAPI_CALLBACK_ARGS)
uint32_t i; uint32_t i;
if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) { if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
zlog_warn("Failure to decode Nexthop update message"); zlog_err("Failure to decode Nexthop update message");
return 0; return 0;
} }

View File

@ -735,10 +735,8 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
pim = vrf->info; pim = vrf->info;
if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) { if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
if (PIM_DEBUG_PIM_NHT) zlog_err("%s: Decode of nexthop update from zebra failed",
zlog_debug( __func__);
"%s: Decode of nexthop update from zebra failed",
__func__);
return 0; return 0;
} }

View File

@ -547,8 +547,7 @@ static int sharp_nexthop_update(ZAPI_CALLBACK_ARGS)
struct zapi_route nhr; struct zapi_route nhr;
if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) { if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
zlog_warn("%s: Decode of update failed", __func__); zlog_err("%s: Decode of update failed", __func__);
return 0; return 0;
} }

View File

@ -184,7 +184,7 @@ static int static_zebra_nexthop_update(ZAPI_CALLBACK_ARGS)
afi_t afi = AFI_IP; afi_t afi = AFI_IP;
if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) { if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
zlog_warn("Failure to decode nexthop update message"); zlog_err("Failure to decode nexthop update message");
return 1; return 1;
} }