proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:09:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Releasing/uninstalling re-work with groups

Browse Source 
Re-work the code to release/uninstall after the addition
of groups.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2019-05-14 13:56:38 -07:00
parent ab942eb285
commit 7512f617c7
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
zebra/zebra_nhg.c
View File

@ -496,15 +496,23 @@ void zebra_nhg_free(void *arg)
*/ */
void zebra_nhg_release(struct nhg_hash_entry *nhe) void zebra_nhg_release(struct nhg_hash_entry *nhe)
{ {
if (nhe->refcnt) if (!nhe->refcnt) {
flog_err( zlog_debug("Releasing nexthop group with ID (%u)", nhe->id);
EC_ZEBRA_NHG_SYNC, hash_release(zrouter.nhgs, nhe);
"Releasing a nexthop group with ID (%u) that we are still using for a route", hash_release(zrouter.nhgs_id, nhe);
nhe->id); zebra_nhg_free(nhe);
}
}
hash_release(zrouter.nhgs, nhe); /**
hash_release(zrouter.nhgs_id, nhe); * zebra_nhg_uninstall_release() - Unistall and release a nhe
zebra_nhg_free(nhe); *
* @nhe: Nexthop group hash entry
*/
static void zebra_nhg_uninstall_release(struct nhg_hash_entry *nhe)
{
zebra_nhg_uninstall_kernel(nhe);
// zebra_nhg_release(nhe);
} }
/** /**
@ -529,7 +537,7 @@ void zebra_nhg_decrement_ref(struct nhg_hash_entry *nhe)
nhe->refcnt--; nhe->refcnt--;
if (!nhe->is_kernel_nh && nhe->refcnt <= 0) { if (!nhe->is_kernel_nh && nhe->refcnt <= 0) {
zebra_nhg_uninstall_kernel(nhe); zebra_nhg_uninstall_release(nhe);
} }
} }
@ -1173,6 +1181,7 @@ void zebra_nhg_dplane_result(struct zebra_dplane_ctx *ctx)
nhe = zebra_nhg_lookup_id(id); nhe = zebra_nhg_lookup_id(id);
if (nhe) { if (nhe) {
UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_QUEUED);
if (IS_ZEBRA_DEBUG_DPLANE_DETAIL) if (IS_ZEBRA_DEBUG_DPLANE_DETAIL)
zlog_debug( zlog_debug(
"Nexthop dplane ctx %p, op %s, nexthop ID (%u), result %s", "Nexthop dplane ctx %p, op %s, nexthop ID (%u), result %s",
@ -1183,7 +1192,6 @@ void zebra_nhg_dplane_result(struct zebra_dplane_ctx *ctx)
case DPLANE_OP_NH_DELETE: case DPLANE_OP_NH_DELETE:
if (status == ZEBRA_DPLANE_REQUEST_SUCCESS) { if (status == ZEBRA_DPLANE_REQUEST_SUCCESS) {
UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED); UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED);
zebra_nhg_release(nhe);
} else { } else {
flog_err( flog_err(
EC_ZEBRA_DP_DELETE_FAIL, EC_ZEBRA_DP_DELETE_FAIL,
@ -1202,7 +1210,6 @@ void zebra_nhg_dplane_result(struct zebra_dplane_ctx *ctx)
nhe->id); nhe->id);
UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED); UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED);
} }
UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_QUEUED);
break; break;
case DPLANE_OP_ROUTE_INSTALL: case DPLANE_OP_ROUTE_INSTALL:
case DPLANE_OP_ROUTE_UPDATE: case DPLANE_OP_ROUTE_UPDATE: