1- From a05f213343ee7ee5dbfcfd1984c40db5c262db3c Mon Sep 17 00:00:00 2001
2- From: stormliang <
[email protected] >
3- Date: Mon, 19 Jun 2023 13:57:01 +0000
4- Subject: [PATCH] From c423bce4db804c1d07d65ce3d06a9e62c4eceb2b Mon Sep 17
5- 00:00:00 2001 Subject: [PATCH] change log level for graceful restart events
6-
7-
81diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
9- index 9624adfbe..74b4dfc4a 100644
2+ index 504343994..f58ab7c02 100644
103--- a/bgpd/bgp_fsm.c
114+++ b/bgpd/bgp_fsm.c
12- @@ -778,10 +778,10 @@ static void bgp_graceful_restart_timer_expire(struct thread *thread)
13-
14- peer = THREAD_ARG(thread) ;
15-
5+ @@ -739,9 +739,9 @@ static void bgp_graceful_restart_timer_expire(struct event *thread)
6+ afi_t afi;
7+ safi_t safi ;
8+
169- if (bgp_debug_neighbor_events(peer)) {
1710- zlog_debug("%pBP graceful restart timer expired", peer);
1811- zlog_debug("%pBP graceful restart stalepath timer stopped",
19- - peer);
2012+ if (peer) {
2113+ zlog_info("%pBP graceful restart timer expired", peer);
2214+ zlog_info("%pBP graceful restart stalepath timer stopped",
23- + peer);
15+ peer);
2416 }
25-
26- FOREACH_AFI_SAFI (afi, safi) {
27- @@ -842,8 +842,8 @@ static void bgp_graceful_stale_timer_expire(struct thread *thread)
28-
29- peer = THREAD_ARG(thread);
30-
17+
18+ @@ -801,8 +801,8 @@ static void bgp_graceful_stale_timer_expire(struct event *thread)
19+ afi_t afi;
20+ safi_t safi;
21+
3122- if (bgp_debug_neighbor_events(peer))
3223- zlog_debug("%pBP graceful restart stalepath timer expired",
3324+ if (peer)
3425+ zlog_info("%pBP graceful restart stalepath timer expired",
3526 peer);
36-
27+
3728 /* NSF delete stale route */
38- @@ -1412 ,20 +1412 ,17 @@ enum bgp_fsm_state_progress bgp_stop(struct peer *peer )
29+ @@ -1380 ,20 +1380 ,17 @@ enum bgp_fsm_state_progress bgp_stop(struct peer_connection *connection )
3930 /* graceful restart */
40- if (peer ->t_gr_stale) {
41- THREAD_OFF(peer ->t_gr_stale);
31+ if (connection ->t_gr_stale) {
32+ EVENT_OFF(connection ->t_gr_stale);
4233- if (bgp_debug_neighbor_events(peer))
4334- zlog_debug(
44- - "%pBP graceful restart stalepath timer stopped",
45- - peer);
46- + zlog_info(
47- + "%pBP graceful restart stalepath timer stopped",
48- + peer);
35+ + zlog_info(
36+ "%pBP graceful restart stalepath timer stopped",
37+ peer);
4938 }
5039 if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT)) {
5140- if (bgp_debug_neighbor_events(peer)) {
@@ -62,55 +51,46 @@ index 9624adfbe..74b4dfc4a 100644
6251+ zlog_info(
6352+ "%pBP graceful restart stalepath timer started for %d sec",
6453+ peer, peer->bgp->stalepath_time);
65- BGP_TIMER_ON(peer ->t_gr_restart,
54+ BGP_TIMER_ON(connection ->t_gr_restart,
6655 bgp_graceful_restart_timer_expire,
6756 peer->v_gr_restart);
68- @@ -2225,17 +2222,15 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer )
57+ @@ -2216,8 +2213,7 @@ bgp_establish(struct peer_connection *connection )
6958 UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE);
70- if (peer ->t_gr_stale) {
71- THREAD_OFF(peer ->t_gr_stale);
59+ if (connection ->t_gr_stale) {
60+ EVENT_OFF(connection ->t_gr_stale);
7261- if (bgp_debug_neighbor_events(peer))
7362- zlog_debug(
74- - "%pBP graceful restart stalepath timer stopped",
75- - peer);
7663+ zlog_info(
77- + "%pBP graceful restart stalepath timer stopped",
78- + peer);
64+ "%pBP graceful restart stalepath timer stopped",
65+ peer);
7966 }
80- }
81-
82- if (peer ->t_gr_restart) {
83- THREAD_OFF(peer ->t_gr_restart);
67+ @@ -2225,8 +2221,7 @@ bgp_establish(struct peer_connection *connection)
68+
69+ if (connection ->t_gr_restart) {
70+ EVENT_OFF(connection ->t_gr_restart);
8471- if (bgp_debug_neighbor_events(peer))
8572- zlog_debug("%pBP graceful restart timer stopped", peer);
8673+ zlog_info("%pBP graceful restart timer stopped", peer);
8774 }
88-
75+
8976 /* Reset uptime, turn on keepalives, send current table. */
9077diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
91- index 8b3a1e3dd..2f3b837a5 100644
78+ index d6d874be2..337879a2d 100644
9279--- a/bgpd/bgpd.c
9380+++ b/bgpd/bgpd.c
94- @@ -2453,15 +2453,13 @@ void peer_nsf_stop(struct peer *peer)
95-
96- if (peer->t_gr_restart) {
97- THREAD_OFF (peer->t_gr_restart);
81+ @@ -2629,13 +2629,11 @@ void peer_nsf_stop(struct peer *peer)
82+
83+ if (peer->connection-> t_gr_restart) {
84+ EVENT_OFF (peer->connection ->t_gr_restart);
9885- if (bgp_debug_neighbor_events(peer))
9986- zlog_debug("%pBP graceful restart timer stopped", peer);
10087+ zlog_info("%pBP graceful restart timer stopped", peer);
10188 }
102- if (peer->t_gr_stale) {
103- THREAD_OFF (peer->t_gr_stale);
89+ if (peer->connection-> t_gr_stale) {
90+ EVENT_OFF (peer->connection ->t_gr_stale);
10491- if (bgp_debug_neighbor_events(peer))
10592- zlog_debug(
106- - "%pBP graceful restart stalepath timer stopped",
107- - peer);
10893+ zlog_info(
109- + "%pBP graceful restart stalepath timer stopped",
110- + peer);
94+ "%pBP graceful restart stalepath timer stopped",
95+ peer);
11196 }
112- bgp_clear_route_all(peer);
113- }
114- - -
115- 2.17.1
116-
0 commit comments