[build]: wait for conflicts package to be uninstalled (#5039)

when parallel build is enabled, both docker-fpm-frr and docker-syncd-brcm is built at the same time, docker-fpm-frr requires swss which requires to install libsaivs-dev. docker-syncd-brcm requires syncd package which requires to install libsaibcm-dev. since libsaivs-dev and libsaibcm-dev install the sai header in the same location, these two packages cannot be installed at the same time. Therefore, we need to serialize the build between these two packages. Simply uninstall the conflict package is not enough to solve this issue. The correct solution is to have one package wait for another package to be uninstalled. For example, if syncd is built first, then it will install libsaibcm-dev. Meanwhile, if the swss build job starts and tries to install libsaivs-dev, it will first try to query if libsaibcm-dev is installed or not. if it is installed, then it will wait until libsaibcm-dev is uninstalled. After syncd job is finished, it will uninstall libsaibcm-dev and swss build job will be unblocked. To solve this issue, _UNINSTALLS is introduced to uninstall a package that is no longer needed and to allow blocked job to continue. Signed-off-by: Guohan Lu <lguohan@gmail.com>
sonic-net · Jan 20, 2021 · 6cca5cd · 6cca5cd
1 parent 0510ece
commit 6cca5cd
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 32 deletions.
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
@@ -2,5 +2,6 @@ BFN_SAI = bfnsdk_8.5.x.59217b4.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_5/bfnsdk_8.5.x.59217b4.deb"
 
 SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
+$(eval $(call add_conflict_package,$(BFN_SAI),$(LIBSAIVS_DEV)))
+
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
-$(BFN_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)
diff --git a/platform/barefoot/rules.mk b/platform/barefoot/rules.mk
@@ -23,6 +23,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
 # Inject sai into syncd
 #$(SYNCD)_DEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)
 $(SYNCD)_DEPENDS += $(BFN_SAI) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)
+$(SYNCD)_UNINSTALLS += $(BFN_SAI)
 
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)

diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
@@ -33,6 +33,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
 
 # Inject brcm sai into syncd
 $(SYNCD)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
+$(SYNCD)_UNINSTALLS += $(BRCM_SAI_DEV)
+
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
 endif

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -7,4 +7,4 @@ $(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsa
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
-$(BRCM_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)
+$(eval $(call add_conflict_package,$(BRCM_SAI_DEV),$(LIBSAIVS_DEV)))
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
@@ -16,6 +16,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
 
 # Inject cavium sai into syncd
 $(SYNCD)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI)
+$(SYNCD)_UNINSTALLS += $(CAVM_LIBSAI)
+
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV_CAVM)
 endif

diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk
@@ -14,6 +14,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
 
 # Inject centec sai into syncd
 $(SYNCD)_DEPENDS += $(CENTEC_SAI)
+$(SYNCD)_UNINSTALLS += $(CENTEC_SAI)
+
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
 endif

diff --git a/platform/centec/sdk.mk b/platform/centec/sdk.mk
@@ -1,6 +1,6 @@
 # Centec SAI
 CENTEC_SAI = libsai_1.3.3_amd64.deb
 $(CENTEC_SAI)_URL = https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/SONiC_1.3.3/libsai_1.3.3-1.0_amd64.deb
-$(CENTEC_SAI)_CONFLICTS += $(LIBSAIVS_DEV)
+$(eval $(call add_conflict_package,$(CENTEC_SAI),$(LIBSAIVS_DEV)))
 
 SONIC_ONLINE_DEBS += $(CENTEC_SAI)
diff --git a/platform/innovium/invm-sai.mk b/platform/innovium/invm-sai.mk
@@ -10,7 +10,7 @@ $(INVM_LIBSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_LIBSAI)
 $(INVM_HSAI)_URL   =  $(INVM_SAI_ONLINE)/$(INVM_HSAI)
 $(INVM_DRV)_URL    =  $(INVM_SAI_ONLINE)/$(INVM_DRV)
 
-$(INVM_HSAI)_CONFLICTS += $(LIBSAIVS_DEV)
+$(eval $(call add_conflict_package,$(INVM_HSAI),$(LIBSAIVS_DEV)))
 
 SONIC_ONLINE_DEBS  += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV)
 SONIC_STRETCH_DEBS += $(INVM_DRV)
diff --git a/platform/innovium/rules.mk b/platform/innovium/rules.mk
@@ -16,6 +16,7 @@ SONIC_ALL += $(SONIC_INVM_ONE_IMAGE) \
 
 # Inject invm sai into syncd
 $(SYNCD)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV_INVM)
+$(SYNCD)_UNINSTALLS += $(INVM_HSAI)
 
 # Runtime dependency on invm sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(INVM_HSAI)
diff --git a/platform/marvell/rules.mk b/platform/marvell/rules.mk
@@ -13,6 +13,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
 
 # Inject mrvl sai into syncd
 $(SYNCD)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI)
+$(SYNCD)_UNINSTALLS += $(MRVL_SAI)
+
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
 endif

diff --git a/platform/marvell/sai.mk b/platform/marvell/sai.mk
@@ -6,6 +6,6 @@ export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
 $(MRVL_SAI)_DEPENDS += $(MRVL_FPA)
-$(MRVL_SAI)_CONFLICTS = $(LIBSAIVS_DEV)
+$(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV)))
 
 SONIC_MAKE_DEBS += $(MRVL_SAI)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
@@ -9,5 +9,5 @@ MLNX_SAI = mlnx-sai_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb
 $(MLNX_SAI)_SRC_PATH = $(PLATFORM_PATH)/mlnx-sai
 $(MLNX_SAI)_DEPENDS += $(MLNX_SDK_DEBS)
 $(MLNX_SAI)_RDEPENDS += $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS)
-$(MLNX_SAI)_CONFLICTS += $(LIBSAIVS_DEV)
+$(eval $(call add_conflict_package,$(MLNX_SAI),$(LIBSAIVS_DEV)))
 SONIC_MAKE_DEBS += $(MLNX_SAI)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
@@ -23,6 +23,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
 
 # Inject mlnx sai into syncd
 $(SYNCD)_DEPENDS += $(MLNX_SAI)
+$(SYNCD)_UNINSTALLS += $(MLNX_SAI)
+
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
 endif

diff --git a/platform/nephos/rules.mk b/platform/nephos/rules.mk
@@ -22,6 +22,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM)
 
 # Inject nephos sai into syncd
 $(SYNCD)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
+$(SYNCD)_UNINSTALLS += $(NEPHOS_SAI_DEV)
+
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
 endif

diff --git a/platform/nephos/sai.mk b/platform/nephos/sai.mk
@@ -11,4 +11,4 @@ $(NEPHOS_SAI_DEV)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsa
 
 SONIC_ONLINE_DEBS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
 $(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI)
-$(NEPHOS_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)
+$(eval $(call add_conflict_package,$(NEPHOS_SAI_DEV),$(LIBSAIVS_DEV)))
diff --git a/rules/functions b/rules/functions
@@ -91,8 +91,32 @@ $(1)_EXTRA_DEBS += $(2)
 SONIC_EXTRA_DEBS += $(2)
 endef
 
+###############################################################################
+## Definition of conflict packages
+###############################################################################
+
+# call:
+#     add_conflict_package some_deb.deb, conflict_deb
+define add_conflict_package
+$(1)_CONFLICT_DEBS += $(2)
+$(2)_CONFLICT_DEBS += $(1)
+endef
+
 ###############################################################################
 ## Utility functions
 ###############################################################################
 
 expand = $(foreach d,$(1),$(call expand,$($(d)_$(2)),$(2))) $(1)
+
+###############################################################################
+## Uninstall debs
+###############################################################################
+define UNINSTALL_DEBS
+$(info $(1))
+$(foreach deb,$(1), \
+	{ while true; do \
+		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then \
+			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -P $(firstword $(subst _, ,$(basename $(deb)))) $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; } \
+	    fi; \
+	done; } )
+endef
diff --git a/rules/sairedis.mk b/rules/sairedis.mk
@@ -16,6 +16,7 @@ $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS)))
 
 LIBSAIVS_DEV = libsaivs-dev_1.0.0_amd64.deb
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DEV)))
+$(LIBSAIVS_DEV)_DEPENDS += $(LIBSAIVS)
 
 LIBSAIMETADATA = libsaimetadata_1.0.0_amd64.deb
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA)))

diff --git a/rules/swss.mk b/rules/swss.mk
@@ -6,6 +6,7 @@ $(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
     $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV) \
     $(LIBSAIVS) $(LIBSAIVS_DEV)
 $(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
+$(SWSS)_UNINSTALLS = $(LIBSAIVS_DEV)
 
 SONIC_DPKG_DEBS += $(SWSS)
 

diff --git a/slave.mk b/slave.mk
@@ -254,6 +254,10 @@ $(addprefix $(FILES_PATH)/, $(SONIC_MAKE_FILES)) : $(FILES_PATH)/% : .platform $
 	make DEST=$(shell pwd)/$(FILES_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(FILES_PATH)/$* $(LOG)
 	# Clean up
 	if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; popd; fi
+
+	# Uninstall unneeded build dependency
+	$(call UNINSTALL_DEBS,$($*_UNINSTALLS))
+
 	$(FOOTER)
 
 SONIC_TARGET_LIST += $(addprefix $(FILES_PATH)/, $(SONIC_MAKE_FILES))
@@ -280,6 +284,10 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 	DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC}" make DEST=$(shell pwd)/$(DEBS_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(DEBS_PATH)/$* $(LOG)
 	# Clean up
 	if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; popd; fi
+
+	# Uninstall unneeded build dependency
+	$(call UNINSTALL_DEBS,$($*_UNINSTALLS))
+
 	$(FOOTER)
 
 SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS))
@@ -308,6 +316,10 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 	if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; popd; fi
 	# Take built package(s)
 	mv $(addprefix $($*_SRC_PATH)/../, $* $($*_DERIVED_DEBS) $($*_EXTRA_DEBS)) $(DEBS_PATH) $(LOG)
+
+	# Uninstall unneeded build dependency
+	$(call UNINSTALL_DEBS,$($*_UNINSTALLS))
+
 	$(FOOTER)
 
 SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS))
@@ -375,35 +387,18 @@ SONIC_INSTALL_TARGETS = $(addsuffix -install,$(addprefix $(DEBS_PATH)/, \
 			$(SONIC_PYTHON_STDEB_DEBS) \
 			$(SONIC_DERIVED_DEBS) \
 			$(SONIC_EXTRA_DEBS)))
-$(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) $(DEBS_PATH)/$$* $$(addsuffix -uninstall,$$(addprefix $(DEBS_PATH)/,$$($$*_CONFLICTS)))
-	$(HEADER)
-	[ -f $(DEBS_PATH)/$* ] || { echo $(DEBS_PATH)/$* does not exist $(LOG) && false $(LOG) }
-	# put a lock here because dpkg does not allow installing packages in parallel
-	while true; do
-	if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
-	{ sudo dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; }
-	fi
-	done
-	$(FOOTER)
 
-# Targets for installing debian packages prior to build one that depends on them
-SONIC_UNINSTALL_TARGETS = $(addsuffix -uninstall,$(addprefix $(DEBS_PATH)/, \
-			$(SONIC_ONLINE_DEBS) \
-			$(SONIC_COPY_DEBS) \
-			$(SONIC_MAKE_DEBS) \
-			$(SONIC_DPKG_DEBS) \
-			$(SONIC_PYTHON_STDEB_DEBS) \
-			$(SONIC_DERIVED_DEBS) \
-			$(SONIC_EXTRA_DEBS)))
-
-$(SONIC_UNINSTALL_TARGETS) : $(DEBS_PATH)/%-uninstall : .platform
+$(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) $(DEBS_PATH)/$$*
 	$(HEADER)
 	[ -f $(DEBS_PATH)/$* ] || { echo $(DEBS_PATH)/$* does not exist $(LOG) && false $(LOG) }
-	# put a lock here because dpkg does not allow installing packages in parallel
 	while true; do
-	if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
-	{ sudo DEBIAN_FRONTEND=noninteractive dpkg -P $(firstword $(subst _, ,$(basename $*))) $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; }
-	fi
+		# wait for conflicted packages to be uninstalled
+		$(foreach deb, $($*_CONFLICT_DEBS), \
+			{ while dpkg -s $(firstword $(subst _, ,$(basename $(deb)))) &> /dev/null; do echo "waiting for $(deb) to be uninstalled" $(LOG); sleep 1; done } )
+		# put a lock here because dpkg does not allow installing packages in parallel
+		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
+			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; }
+		fi
 	done
 	$(FOOTER)