forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request sonic-net#67 from mssonicbld/sonicbld/202205-merge
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
- Loading branch information
Showing
19 changed files
with
168 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z | ||
| deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z | ||
| debian==20230711T000205Z | ||
| debian-security==20230711T000122Z | ||
| debian==20230716T000128Z | ||
| debian-security==20230716T000215Z | ||
| download.docker.com_linux_debian_dists_bullseye==2023-07-07T20:10:57Z | ||
| download.docker.com_linux_debian_dists_buster==2023-07-07T20:10:57Z | ||
| packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z | ||
| packages.trafficmanager.net_snapshot_debian-security_20230711T000122Z_dists_bullseye-security==2023-07-10T21:32:37Z | ||
| packages.trafficmanager.net_snapshot_debian-security_20230711T000122Z_dists_buster_updates==2023-07-10T21:32:36Z | ||
| packages.trafficmanager.net_snapshot_debian_20230711T000205Z_dists_bullseye==2023-06-10T08:52:21Z | ||
| packages.trafficmanager.net_snapshot_debian_20230711T000205Z_dists_bullseye-backports==2023-07-10T20:15:45Z | ||
| packages.trafficmanager.net_snapshot_debian_20230711T000205Z_dists_bullseye-updates==2023-07-10T20:15:45Z | ||
| packages.trafficmanager.net_snapshot_debian_20230711T000205Z_dists_buster==2023-06-10T08:53:33Z | ||
| packages.trafficmanager.net_snapshot_debian_20230711T000205Z_dists_buster-backports==2023-07-10T20:15:45Z | ||
| packages.trafficmanager.net_snapshot_debian_20230711T000205Z_dists_buster-updates==2023-06-10T08:55:10Z | ||
| packages.trafficmanager.net_snapshot_debian-security_20230716T000215Z_dists_bullseye-security==2023-07-14T23:42:45Z | ||
| packages.trafficmanager.net_snapshot_debian-security_20230716T000215Z_dists_buster_updates==2023-07-14T23:42:45Z | ||
| packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_bullseye==2023-06-10T08:52:21Z | ||
| packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_bullseye-backports==2023-07-15T20:35:32Z | ||
| packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_bullseye-updates==2023-07-15T20:35:32Z | ||
| packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_buster==2023-06-10T08:53:33Z | ||
| packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_buster-backports==2023-07-15T20:35:32Z | ||
| packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_buster-updates==2023-06-10T08:55:10Z |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule dhcprelay
updated
21 files
| +8 −3 | .azure-pipelines/build.yml | |
| +8 −1 | .github/workflows/codeql-analysis.yml | |
| +22 −0 | .github/workflows/semgrep.yml | |
| +3 −0 | .gitmodules | |
| +4 −1 | Makefile | |
| +1 −1 | azurepipelines-coverage.yml | |
| +1 −0 | gmock_global | |
| +21 −34 | src/config_interface.cpp | |
| +3 −19 | src/config_interface.h | |
| +14 −5 | src/main.cpp | |
| +390 −179 | src/relay.cpp | |
| +65 −40 | src/relay.h | |
| +1 −1 | src/subdir.mk | |
| +0 −3 | test/MockRelay.h | |
| +67 −0 | test/mock_config_interface.cpp | |
| +12 −0 | test/mock_config_interface.h | |
| +357 −119 | test/mock_relay.cpp | |
| +15 −0 | test/mock_relay.h | |
| +1 −1 | test/mock_send.cpp | |
| +3 −1 | test/mock_send.h | |
| +3 −2 | test/subdir.mk |
122 changes: 122 additions & 0 deletions
122
src/sonic-frr/patch/0029-bgpd-Change-log-level-for-graceful-restart-events.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| From c423bce4db804c1d07d65ce3d06a9e62c4eceb2b Mon Sep 17 00:00:00 2001 | ||
| From: stormliang <stormliang@microsoft.com> | ||
| Date: Mon, 19 Jun 2023 13:57:01 +0000 | ||
| Subject: [PATCH] change log level for graceful restart events | ||
|
|
||
| --- | ||
| bgpd/bgp_fsm.c | 44 ++++++++++++++++++++------------------------ | ||
| bgpd/bgpd.c | 12 +++++------- | ||
| 2 files changed, 25 insertions(+), 31 deletions(-) | ||
|
|
||
| diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c | ||
| index 672fa4512..e392cd6e1 100644 | ||
| --- a/bgpd/bgp_fsm.c | ||
| +++ b/bgpd/bgp_fsm.c | ||
| @@ -786,9 +786,9 @@ static int bgp_graceful_restart_timer_expire(struct thread *thread) | ||
|
|
||
| peer = THREAD_ARG(thread); | ||
|
|
||
| - if (bgp_debug_neighbor_events(peer)) { | ||
| - zlog_debug("%s graceful restart timer expired", peer->host); | ||
| - zlog_debug("%s graceful restart stalepath timer stopped", | ||
| + if (peer) { | ||
| + zlog_info("%s graceful restart timer expired", peer->host); | ||
| + zlog_info("%s graceful restart stalepath timer stopped", | ||
| peer->host); | ||
| } | ||
|
|
||
| @@ -852,8 +852,8 @@ static int bgp_graceful_stale_timer_expire(struct thread *thread) | ||
|
|
||
| peer = THREAD_ARG(thread); | ||
|
|
||
| - if (bgp_debug_neighbor_events(peer)) | ||
| - zlog_debug("%s graceful restart stalepath timer expired", | ||
| + if (peer) | ||
| + zlog_info("%s graceful restart stalepath timer expired", | ||
| peer->host); | ||
|
|
||
| /* NSF delete stale route */ | ||
| @@ -1427,20 +1427,18 @@ int bgp_stop(struct peer *peer) | ||
| /* graceful restart */ | ||
| if (peer->t_gr_stale) { | ||
| BGP_TIMER_OFF(peer->t_gr_stale); | ||
| - if (bgp_debug_neighbor_events(peer)) | ||
| - zlog_debug( | ||
| - "%s graceful restart stalepath timer stopped", | ||
| - peer->host); | ||
| + zlog_info( | ||
| + "%s graceful restart stalepath timer stopped", | ||
| + peer->host); | ||
| } | ||
| if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT)) { | ||
| - if (bgp_debug_neighbor_events(peer)) { | ||
| - zlog_debug( | ||
| - "%s graceful restart timer started for %d sec", | ||
| - peer->host, peer->v_gr_restart); | ||
| - zlog_debug( | ||
| - "%s graceful restart stalepath timer started for %d sec", | ||
| - peer->host, peer->bgp->stalepath_time); | ||
| - } | ||
| + zlog_info( | ||
| + "%s graceful restart timer started for %d sec", | ||
| + peer->host, peer->v_gr_restart); | ||
| + zlog_info( | ||
| + "%s graceful restart stalepath timer started for %d sec", | ||
| + peer->host, peer->bgp->stalepath_time); | ||
| + | ||
| BGP_TIMER_ON(peer->t_gr_restart, | ||
| bgp_graceful_restart_timer_expire, | ||
| peer->v_gr_restart); | ||
| @@ -2205,18 +2203,16 @@ static int bgp_establish(struct peer *peer) | ||
| UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE); | ||
| if (peer->t_gr_stale) { | ||
| BGP_TIMER_OFF(peer->t_gr_stale); | ||
| - if (bgp_debug_neighbor_events(peer)) | ||
| - zlog_debug( | ||
| - "%s graceful restart stalepath timer stopped", | ||
| - peer->host); | ||
| + zlog_info( | ||
| + "%s graceful restart stalepath timer stopped", | ||
| + peer->host); | ||
| } | ||
| } | ||
|
|
||
| if (peer->t_gr_restart) { | ||
| BGP_TIMER_OFF(peer->t_gr_restart); | ||
| - if (bgp_debug_neighbor_events(peer)) | ||
| - zlog_debug("%s graceful restart timer stopped", | ||
| - peer->host); | ||
| + zlog_info("%s graceful restart timer stopped", | ||
| + peer->host); | ||
| } | ||
|
|
||
| /* Reset uptime, turn on keepalives, send current table. */ | ||
| diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c | ||
| index 7e528b219..2fc471555 100644 | ||
| --- a/bgpd/bgpd.c | ||
| +++ b/bgpd/bgpd.c | ||
| @@ -2346,16 +2346,14 @@ void peer_nsf_stop(struct peer *peer) | ||
|
|
||
| if (peer->t_gr_restart) { | ||
| BGP_TIMER_OFF(peer->t_gr_restart); | ||
| - if (bgp_debug_neighbor_events(peer)) | ||
| - zlog_debug("%s graceful restart timer stopped", | ||
| - peer->host); | ||
| + zlog_info("%s graceful restart timer stopped", | ||
| + peer->host); | ||
| } | ||
| if (peer->t_gr_stale) { | ||
| BGP_TIMER_OFF(peer->t_gr_stale); | ||
| - if (bgp_debug_neighbor_events(peer)) | ||
| - zlog_debug( | ||
| - "%s graceful restart stalepath timer stopped", | ||
| - peer->host); | ||
| + zlog_info( | ||
| + "%s graceful restart stalepath timer stopped", | ||
| + peer->host); | ||
| } | ||
| bgp_clear_route_all(peer); | ||
| } | ||
| -- | ||
| 2.25.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule sonic-restapi
updated
16 files
| +22 −0 | .github/workflows/semgrep.yml | |
| +1 −1 | Dockerfile | |
| +2 −2 | Dockerfile.build | |
| +1 −1 | Dockerfile.test | |
| +2 −2 | Makefile | |
| +5 −5 | arpthrift/arp_responder-remote/arp_responder-remote.go | |
| +1 −7 | azurepipeline.yml | |
| +2 −2 | copy.sh | |
| +2 −2 | dependencies.conf | |
| +1 −1 | go-server-server/go.mod | |
| +21 −21 | mseethrift/m_s_e_e-remote/m_s_e_e-remote.go | |
| +1 −1 | mseethrifttest/Makefile | |
| +1 −1 | swsscommon/go.mod | |
| +6 −6 | test/apitest.py | |
| +5 −5 | test/restapi_client.py | |
| +117 −114 | test/test_restapi.py |
Submodule sonic-swss
updated
2 files
| +1 −1 | orchagent/notifications.cpp | |
| +4 −1 | orchagent/notifications.h |