[mellanox|ffb] ISSU version check (#2437)

* Revert "[mellanox]: Integrate CRIU tool to SYNCD docker container (#2061)" This reverts commit 514b38f. Conflicts: platform/mellanox/docker-syncd-mlnx.mk sonic-slave/Dockerfile * [mellanox|ffb] remove unused scripts Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * [mellanox|ffb] ISSU version check Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * [mlnx|ffb] remove extra ';' Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
sonic-net · Jan 22, 2019 · 0921211 · 0921211
1 parent 81467ae
commit 0921211
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 271 deletions.
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -319,9 +319,9 @@ sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
 {% if sonic_asic_platform == "mellanox" %}
 sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
 sudo cp target/files/$MLNX_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
+sudo cp target/files/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
 sudo cp target/files/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
 j2 platform/mellanox/mlnx-fw-upgrade.j2 | sudo tee $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
-j2 platform/mellanox/sdk-version.j2 | sudo tee $FILESYSTEM_ROOT/etc/mlnx/sdk-version
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
 {% endif %}
 

diff --git a/platform/mellanox/criu.mk b/platform/mellanox/criu.mk
diff --git a/platform/mellanox/criu/Makefile b/platform/mellanox/criu/Makefile
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc.mk b/platform/mellanox/docker-syncd-mlnx-rpc.mk
@@ -2,7 +2,7 @@
 
 DOCKER_SYNCD_MLNX_RPC = docker-syncd-mlnx-rpc.gz
 $(DOCKER_SYNCD_MLNX_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx-rpc
-$(DOCKER_SYNCD_MLNX_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(MLNX_SFPD) $(MLNX_ISSU)
+$(DOCKER_SYNCD_MLNX_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(MLNX_SFPD)
 $(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_MLNX)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)

diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
@@ -2,7 +2,7 @@
 
 DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz
 $(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx
-$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MLNX_SFPD) $(CRIU) $(MLNX_ISSU)
+$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MLNX_SFPD)
 $(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
 ifneq ($(ENABLE_SYNCD_RPC),y)
@@ -14,4 +14,4 @@ $(DOCKER_SYNCD_MLNX)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /host/warmboot:/var/warmboot
-$(DOCKER_SYNCD_MLNX)_RUN_OPT += --tmpfs /run/criu
+
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -14,7 +14,7 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
-RUN apt-get install -y --no-install-recommends libxml2 iptables libbsd0 protobuf-c-compiler protobuf-compiler python-protobuf libprotobuf-c1 python-future python-ipaddr libnet1 pkg-config asciidoc xmlto
+RUN apt-get install -y libxml2
 
 RUN dpkg -i \
 {% for deb in docker_syncd_mlnx_debs.split(' ') -%}

diff --git a/platform/mellanox/issu-version.mk b/platform/mellanox/issu-version.mk
@@ -0,0 +1,9 @@
+# ISSU version
+
+ISSU_VERSION_FILE = issu-version
+$(ISSU_VERSION_FILE)_SRC_PATH = $(PLATFORM_PATH)/issu-version
+$(ISSU_VERSION_FILE)_DEPENDS += $(APPLIBS)
+SONIC_MAKE_FILES += $(ISSU_VERSION_FILE)
+
+export ISSU_VERSION_FILE
+
diff --git a/platform/mellanox/issu-version/Makefile b/platform/mellanox/issu-version/Makefile
@@ -0,0 +1,12 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = issu-version
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	sx_sdk --version | egrep -o 'ISSU [0-9]+' > $(DEST)/$(MAIN_TARGET) || {
+		echo "ISSU version is undefined: $(sx_sdk --version)"
+		rm $(DEST)/$(MAIN_TARGET)
+		exit 1
+	}
diff --git a/platform/mellanox/mlnx-ffb.sh b/platform/mellanox/mlnx-ffb.sh
@@ -37,21 +37,26 @@ check_sdk_upgrade()
         mkdir -p "${FS_MOUNTPOINT}"
         mount -t squashfs "${FS_PATH}" "${FS_MOUNTPOINT}" || {
             >&2 echo "Failed to mount next SONiC image"
-            break;
+            break
         }
 
-        SDK_VERSION_FILE_PATH="${FS_MOUNTPOINT}/etc/mlnx/sdk-version"
+        ISSU_VERSION_FILE_PATH="/etc/mlnx/issu-version"
 
-        [ -f "${SDK_VERSION_FILE_PATH}" ] && {
-            NEXT_SDK_VERSION="$(cat ${FS_MOUNTPOINT}/etc/mlnx/sdk-version)"
-        } || {
-            >&2 echo "No SDK version file ${SDK_VERSION_FILE_PATH}"
-            break;
+        [ -f "${SDK_VERSION_FILE_PATH}" ] || {
+            >&2 echo "No ISSU version file found ${ISSU_VERSION_FILE_PATH}"
+            break
         }
 
-        ISSU_CHECK_CMD="docker exec -t syncd issu --check ${NEXT_SDK_VERSION}"
+        CURRENT_ISSU_VERSION="$(cat ${ISSU_VERSION_FILE_PATH})"
+        NEXT_ISSU_VERSION="$(cat ${FS_MOUNTPOINT}/${ISSU_VERSION_FILE_PATH})"
 
-        ${ISS_CHECK_CMD} > /dev/null && CHECK_RESULT="${FFB_SUCCESS}"
+        if [[ "${CURRENT_ISSU_VERSION}" == "${NEXT_ISSU_VERSION}" ]]; then
+            CHECK_RESULT="${FFB_SUCCESS}"
+        else
+            >&2 echo "Current and next ISSU version do not match:"
+            >&2 echo "Current ISSU version: ${CURRENT_ISSU_VERSION}"
+            >&2 echo "Next ISSU version: ${NEXT_ISSU_VERSION}"
+        fi
 
         break
     done
@@ -65,34 +70,15 @@ check_sdk_upgrade()
 check_ffb()
 {
     check_issu_enabled || {
-        echo "ISSU is not enabled on this HWSKU"
+        >&2 echo "ISSU is not enabled on this HWSKU"
         return "${FFB_FAILURE}"
     }
+
     check_sdk_upgrade || {
-        echo "SDK upgrade check failued"
+        >&2 echo "SDK upgrade check failued"
         return "${FFB_FAILURE}"
     }
-    return "${FFB_SUCCESS}";
-}
-
-# Perform ISSU start
-issu_start()
-{
-    ISSU_START_CMD="docker exec -t syncd issu --start"
-    ${ISSU_START_CMD} > /dev/null
-
-    EXIT_CODE=$?
 
-    return $EXIT_CODE
+    return "${FFB_SUCCESS}"
 }
 
-# Perform ISSU end
-issu_end()
-{
-    ISSU_END_CMD="docker exec -t syncd issu --end"
-    ${ISSU_END_CMD} > /dev/null
-
-    EXIT_CODE=$?
-
-    return $EXIT_CODE
-}
diff --git a/platform/mellanox/mlnx-issu.mk b/platform/mellanox/mlnx-issu.mk
diff --git a/platform/mellanox/mlnx-issu/scripts/issu b/platform/mellanox/mlnx-issu/scripts/issu
diff --git a/platform/mellanox/mlnx-issu/setup.py b/platform/mellanox/mlnx-issu/setup.py
diff --git a/platform/mellanox/one-image.mk b/platform/mellanox/one-image.mk
@@ -5,5 +5,5 @@ $(SONIC_ONE_IMAGE)_MACHINE = mellanox
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_INSTALLS += $(SX_KERNEL) $(KERNEL_MFT) $(MFT_OEM) $(MFT) $(MLNX_HW_MANAGEMENT)
 $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
-$(SONIC_ONE_IMAGE)_FILES += $(MLNX_FW_FILE) $(MLNX_FFB_SCRIPT)
+$(SONIC_ONE_IMAGE)_FILES += $(MLNX_FW_FILE) $(MLNX_FFB_SCRIPT) $(ISSU_VERSION_FILE)
 SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
@@ -12,7 +12,7 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/docker-ptf-mlnx.mk
 include $(PLATFORM_PATH)/mlnx-sfpd.mk
 include $(PLATFORM_PATH)/mlnx-ffb.mk
-include $(PLATFORM_PATH)/mlnx-issu.mk
+include $(PLATFORM_PATH)/issu-version.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM)

diff --git a/platform/mellanox/sdk-version.j2 b/platform/mellanox/sdk-version.j2
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
@@ -56,4 +56,3 @@ $(eval $(foreach deb,$(PYTHON_SDK_API) $(SX_KERNEL) $(SX_KERNEL_DEV),$(call make
 
 SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) $(SX_KERNEL)
 
-export MLNX_SDK_VERSION