Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify flushing process

Browse source 
Related to changes from previous patch.
This commit is contained in:
Ondrej Zajicek 2015-05-17 00:54:33 +02:00
parent 86f567e13c
commit d0e23d42de
1 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
nest/rt-table.c
View file

@ -1384,9 +1384,8 @@ rt_init(void)
static int static int
rt_prune_step(rtable *tab, int step, int *limit) rt_prune_step(rtable *tab, int *limit)
{ {
static struct tbf rl_flush = TBF_DEFAULT_LOG_LIMITS;
struct fib_iterator *fit = &tab->prune_fit; struct fib_iterator *fit = &tab->prune_fit;
DBG("Pruning route table %s\n", tab->name); DBG("Pruning route table %s\n", tab->name);
@ -1411,9 +1410,7 @@ again:
rescan: rescan:
for (e=n->routes; e; e=e->next) for (e=n->routes; e; e=e->next)
if (e->sender->proto->flushing || if (e->sender->proto->flushing || (e->flags & REF_DISCARD))
(e->flags & REF_DISCARD) ||
(step && e->attrs->src->proto->flushing))
{ {
if (*limit <= 0) if (*limit <= 0)
{ {
@ -1421,10 +1418,6 @@ again:
return 0; return 0;
} }
if (step)
log_rl(&rl_flush, L_WARN "Route %I/%d from %s still in %s after flush",
n->n.prefix, n->n.pxlen, e->attrs->src->proto->name, tab->name);
rte_discard(tab, e); rte_discard(tab, e);
(*limit)--; (*limit)--;
@ -1464,7 +1457,7 @@ static inline int
rt_prune_table(rtable *tab) rt_prune_table(rtable *tab)
{ {
int limit = 512; int limit = 512;
return rt_prune_step(tab, 0, &limit); return rt_prune_step(tab, &limit);
} }
/** /**
@ -1473,37 +1466,17 @@ rt_prune_table(rtable *tab)
* The prune loop scans routing tables and removes routes belonging to flushing * The prune loop scans routing tables and removes routes belonging to flushing
* protocols, discarded routes and also stale network entries. Returns 1 when * protocols, discarded routes and also stale network entries. Returns 1 when
* all such routes are pruned. It is a part of the protocol flushing loop. * all such routes are pruned. It is a part of the protocol flushing loop.
*
* The prune loop runs in two steps. In the first step it prunes just the routes
* with flushing senders (in explicitly marked tables) so the route removal is
* propagated as usual. In the second step, all remaining relevant routes are
* removed. Ideally, there shouldn't be any, but it happens when pipe filters
* are changed.
*/ */
int int
rt_prune_loop(void) rt_prune_loop(void)
{ {
static int step = 0;
int limit = 512; int limit = 512;
rtable *t; rtable *t;
again:
WALK_LIST(t, routing_tables) WALK_LIST(t, routing_tables)
if (! rt_prune_step(t, step, &limit)) if (! rt_prune_step(t, &limit))
return 0; return 0;
if (step == 0)
{
/* Prepare for the second step */
WALK_LIST(t, routing_tables)
t->prune_state = RPS_SCHEDULED;
step = 1;
goto again;
}
/* Done */
step = 0;
return 1; return 1;
} }