From 4bb8ab349596117f36c782097b9a1b44e8f4f046 Mon Sep 17 00:00:00 2001 From: KISHORE KUNAL <64033340+kishorekunal01@users.noreply.github.com> Date: Thu, 24 Dec 2020 18:36:01 -0800 Subject: [PATCH 1/5] Add support to start fdbsyncd when orchagent docker starts (#5979) Add support to start fdbsyncd when swss docker starts. New demon is added to sync MAC from Kernel to DB and vise versa. --- dockers/docker-orchagent/base_image_files/monit_swss | 4 ++++ dockers/docker-orchagent/critical_processes | 1 + dockers/docker-orchagent/supervisord.conf | 11 +++++++++++ platform/p4/docker-sonic-p4/start.sh | 3 +++ platform/p4/docker-sonic-p4/supervisord.conf | 8 ++++++++ platform/vs/docker-sonic-vs/start.sh | 2 ++ platform/vs/docker-sonic-vs/supervisord.conf | 9 +++++++++ 7 files changed, 38 insertions(+) diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss index 7557bd66ac9a..38862f348b1b 100644 --- a/dockers/docker-orchagent/base_image_files/monit_swss +++ b/dockers/docker-orchagent/base_image_files/monit_swss @@ -4,6 +4,7 @@ ## orchagent ## portsyncd ## neighsyncd +## fdbsyncd ## vrfmgrd ## vlanmgrd ## intfmgrd @@ -22,6 +23,9 @@ check program swss|portsyncd with path "/usr/bin/process_checker swss /usr/bin/p check program swss|neighsyncd with path "/usr/bin/process_checker swss /usr/bin/neighsyncd" if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles +check program swss|fdbsyncd with path "/usr/bin/process_checker swss /usr/bin/fdbsyncd" + if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles + check program swss|vrfmgrd with path "/usr/bin/process_checker swss /usr/bin/vrfmgrd" if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles diff --git a/dockers/docker-orchagent/critical_processes b/dockers/docker-orchagent/critical_processes index 809693684c80..d2dc86a5f7ce 100644 --- a/dockers/docker-orchagent/critical_processes +++ b/dockers/docker-orchagent/critical_processes @@ -1,6 +1,7 @@ program:orchagent program:portsyncd program:neighsyncd +program:fdbsyncd program:vlanmgrd program:intfmgrd program:portmgrd diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf index 4d60606a8104..f1b8edd62211 100644 --- a/dockers/docker-orchagent/supervisord.conf +++ b/dockers/docker-orchagent/supervisord.conf @@ -184,3 +184,14 @@ stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true dependent_startup_wait_for=swssconfig:exited + +[program:fdbsyncd] +command=/usr/bin/fdbsyncd +priority=17 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +dependent_startup=true +dependent_startup_wait_for=swssconfig:exited + diff --git a/platform/p4/docker-sonic-p4/start.sh b/platform/p4/docker-sonic-p4/start.sh index e3251bb2f4e5..2da8fe2249fd 100755 --- a/platform/p4/docker-sonic-p4/start.sh +++ b/platform/p4/docker-sonic-p4/start.sh @@ -58,6 +58,9 @@ supervisorctl start portsyncd echo "Start neighsyncd" supervisorctl start neighsyncd +echo "Start fdbsyncd" +supervisorctl start fdbsyncd + echo "Start teamsyncd" supervisorctl start teamsyncd diff --git a/platform/p4/docker-sonic-p4/supervisord.conf b/platform/p4/docker-sonic-p4/supervisord.conf index 946e4cb36e3a..a4026f61c140 100644 --- a/platform/p4/docker-sonic-p4/supervisord.conf +++ b/platform/p4/docker-sonic-p4/supervisord.conf @@ -131,3 +131,11 @@ autostart=false autorestart=unexpected stdout_logfile=syslog stderr_logfile=syslog + +[program:fdbsyncd] +command=/usr/bin/fdbsyncd +priority=16 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index 3d349a4ad12a..1c0960e598f9 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -103,6 +103,8 @@ supervisorctl start coppmgrd supervisorctl start neighsyncd +supervisorctl start fdbsyncd + supervisorctl start teamsyncd supervisorctl start fpmsyncd diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf index 3312bad48023..61fdb60bcc69 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf +++ b/platform/vs/docker-sonic-vs/supervisord.conf @@ -220,3 +220,12 @@ autostart=false autorestart=false stdout_logfile=syslog stderr_logfile=syslog + +[program:fdbsyncd] +command=/usr/bin/fdbsyncd +priority=25 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + From 94e143cebe1974c4d25941f4ac62b9a1035220de Mon Sep 17 00:00:00 2001 From: Andriy Kokhan <43479230+akokhan@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:45:41 +0200 Subject: [PATCH 2/5] [BFN] Updated SAI headers to v1.7.1 (#6294) Signed-off-by: Andriy Kokhan Co-authored-by: Andriy Kokhan --- platform/barefoot/bfn-platform.mk | 2 +- platform/barefoot/bfn-sai.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk index df1c58592a2f..1524a5be9b07 100644 --- a/platform/barefoot/bfn-platform.mk +++ b/platform/barefoot/bfn-platform.mk @@ -1,4 +1,4 @@ -BFN_PLATFORM = bfnplatform_20201023_deb9.deb +BFN_PLATFORM = bfnplatform_20201224_deb9.deb $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)" SONIC_ONLINE_DEBS += $(BFN_PLATFORM) diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk index 2b16e4ef35d4..0ef4f40258af 100644 --- a/platform/barefoot/bfn-sai.mk +++ b/platform/barefoot/bfn-sai.mk @@ -1,4 +1,4 @@ -BFN_SAI = bfnsdk_20201023_deb9.deb +BFN_SAI = bfnsdk_20201224_deb9.deb $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)" $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV) From 8060142f9cd79d87aced4a39cf7cc2a29e532dc1 Mon Sep 17 00:00:00 2001 From: lguohan Date: Thu, 24 Dec 2020 21:55:20 -0800 Subject: [PATCH 3/5] [build]: disable build sonic-slave-jessie by default (#6297) Signed-off-by: Guohan Lu --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 140ebe8b3c5a..2231e6d98231 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # SONiC make file -NOJESSIE ?= 0 +NOJESSIE ?= 1 NOSTRETCH ?= 0 %:: From 2999dfa57cea1c4a1a71dc0c21dcc2251fbcf9c2 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Fri, 25 Dec 2020 00:10:08 -0800 Subject: [PATCH 4/5] [build][arm]: allow customize docker data root for multiarch docker example: DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker make configure \ PLATFORM=centec-arm64 PLATFORM_ARCH=arm64 Signed-off-by: Guohan Lu --- Makefile.work | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile.work b/Makefile.work index 8d28377ae194..021f9e0c137b 100644 --- a/Makefile.work +++ b/Makefile.work @@ -146,16 +146,20 @@ endif ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y) DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock endif + ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64)) +ifeq ($(DOCKER_DATA_ROOT_FOR_MULTIARCH),) + DOCKER_DATA_ROOT_FOR_MULTIARCH := /var/lib/march/docker +endif # Multiarch docker cannot start dockerd service due to iptables cannot run over different arch kernel SONIC_SERVICE_DOCKERD_FOR_MULTIARCH=y SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH := dockerd --experimental=true --storage-driver=vfs \ - --data-root=/var/lib/march/docker/ --exec-root=/var/run/march/docker/ \ - -H unix:///var/run/march/docker.sock -p /var/run/march/docker.pid + --data-root=$(DOCKER_DATA_ROOT_FOR_MULTIARCH) --exec-root=/var/run/march/docker/ \ + -H unix:///var/run/march/docker.sock -p /var/run/march/docker.pid DOCKER_RUN += -v /var/run/march/docker.sock:/var/run/docker.sock DOCKER_RUN += -v /var/run/march/docker.pid:/var/run/docker.pid DOCKER_RUN += -v /var/run/march/docker:/var/run/docker - DOCKER_RUN += -v /var/lib/march/docker:/var/lib/docker + DOCKER_RUN += -v $(DOCKER_DATA_ROOT_FOR_MULTIARCH):/var/lib/docker SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH := setfacl -m user:$(USER):rw /var/run/march/docker.sock #Override Native config to prevent docker service @@ -247,7 +251,7 @@ endif @$(OVERLAY_MODULE_CHECK) @pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd - @cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_BASE_IMAGE)/buildinfo + @cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo @docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \ { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \ $(DOCKER_BASE_BUILD) ; \ @@ -267,7 +271,7 @@ endif sonic-build-hooks: @pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd - @cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_BASE_IMAGE)/buildinfo + @cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo sonic-slave-base-build : sonic-build-hooks @$(OVERLAY_MODULE_CHECK) From 3690c1a0d9383d01267bb0f5e6776440a6e8b7d1 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Fri, 25 Dec 2020 02:21:57 -0800 Subject: [PATCH 5/5] [build]: add arch name in sonic-slave docker image for exmaple, for arm64, the sonic-slave docker image name is sonic-slave-arm64-$(USER) for amd64, the docker image is kept as it is Signed-off-by: Guohan Lu --- Makefile.work | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.work b/Makefile.work index 021f9e0c137b..0605eae14764 100644 --- a/Makefile.work +++ b/Makefile.work @@ -91,7 +91,11 @@ endif include rules/config +ifeq ($(CONFIGURED_ARCH),amd64) SLAVE_BASE_IMAGE = $(SLAVE_DIR) +else +SLAVE_BASE_IMAGE = $(SLAVE_DIR)-$(CONFIGURED_ARCH) +endif SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER) # Generate the version control build info