Merge remote-tracking branch 'upstream/master' into tunnelmgr

Makefile

@@ -1,6 +1,6 @@
 # SONiC make file
 
-NOJESSIE ?= 0
+NOJESSIE ?= 1
 NOSTRETCH ?= 0
 
 %::

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
@@ -146,16 +150,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 +255,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 +275,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)

dockers/docker-orchagent/base_image_files/monit_swss

@@ -4,6 +4,7 @@
 ##  orchagent
 ##  portsyncd
 ##  neighsyncd
+##  fdbsyncd
 ##  vrfmgrd
 ##  vlanmgrd
 ##  intfmgrd
@@ -24,6 +25,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
 

dockers/docker-orchagent/critical_processes

@@ -1,6 +1,7 @@
 program:orchagent
 program:portsyncd
 program:neighsyncd
+program:fdbsyncd
 program:vlanmgrd
 program:intfmgrd
 program:portmgrd

dockers/docker-orchagent/supervisord.conf

@@ -194,3 +194,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
+

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)

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)

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
 

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

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

platform/vs/docker-sonic-vs/supervisord.conf

@@ -221,9 +221,17 @@ 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
+
 [program:tunnelmgrd]
 command=/usr/bin/tunnelmgrd
-priority=25
+priority=26
 autostart=false
 autorestart=false
 stdout_logfile=syslog