From 181d6ccbb8f7fdfa46cb2bacb599406bb810f1c0 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 8 Jan 2020 17:33:13 +0100
Subject: baremetal, virtual: Bump kernel to hwe-18.04 (5.0)

On some aarch64 platforms (e.g. ThunderX 1), lvcreate manifests some
spurious timing issues resulting in incomplete/corrupted LVM thin

creation and eventually to transaction ID mismatch between userspace
and kernel space.

This eventually leads to cinder-volume issues, either when creating
the thin storage pool (vgroot-pool) and/or when creating the LVs
inside said pool.

The issue manifests spuriously on Ubuntu Bionic + UCA, so until a
working combination of userspace/kernel is found, work around this
by bumping the kernel package to hwe-18.04 (kernel 5.0),
effectively bypassing the timing issues during volume creation.

This affects all cluster machines (both HA and NOHA scenarios,
baremetal and virtual, x86_64 and aarch64, baremetal and virtualized
nodes).

Note: Ubuntu Bionic cloud image partition handling requires e2fsprogs
1.43, not currently available on Ubuntu Xenial / CentOS 7.

Change-Id: I839e03080104c391fe18185b9544c9df43c114e6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit f03bfd30206c1d21de7e5c9ef2f6ed79f6ee13f4)
---
 mcp/scripts/lib_jump_common.sh    | 20 ++++++++++++++++++++
 mcp/scripts/lib_jump_deploy.sh    | 10 +++++++---
 mcp/scripts/requirements_deb.yaml |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'mcp/scripts')

diff --git a/mcp/scripts/lib_jump_common.sh b/mcp/scripts/lib_jump_common.sh
index 7cfdd4254..c2bd46649 100644
--- a/mcp/scripts/lib_jump_common.sh
+++ b/mcp/scripts/lib_jump_common.sh
@@ -138,6 +138,26 @@ function docker_install {
   fi
 }
 
+function e2fsprogs_install {
+  local image_dir=$1
+  E2FS_VER=$(e2fsck -V 2>&1 | grep -Pzo "e2fsck \K1\.\d{2}")
+  if [ "${E2FS_VER//./}" -lt 143 ]; then
+    E2FS_TGZ="${image_dir}/e2fsprogs.tar.gz"
+    E2FS_VER='1.43.9'
+    E2FS_URL="https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/snapshot/e2fsprogs-${E2FS_VER}.tar.gz"
+    notify_n "[WARN] Using e2fsprogs ${E2FS_VER} from ${E2FS_TGZ}" 3
+    if [ ! -e "${E2FS_TGZ}" ]; then
+      curl -L "${E2FS_URL}" -o "${E2FS_TGZ}"
+      mkdir -p "${image_dir}/e2fsprogs"
+      tar xzf "${E2FS_TGZ}" -C "${image_dir}/e2fsprogs" --strip-components=1
+      cd "${image_dir}/e2fsprogs" || exit 1
+      ./configure
+      make
+      cd - || exit 1
+    fi
+  fi
+}
+
 function virtinst_install {
   local image_dir=$1
   VIRT_VER=$(virt-install --version 2>&1)
diff --git a/mcp/scripts/lib_jump_deploy.sh b/mcp/scripts/lib_jump_deploy.sh
index 532508a58..3dc3c4436 100644
--- a/mcp/scripts/lib_jump_deploy.sh
+++ b/mcp/scripts/lib_jump_deploy.sh
@@ -124,11 +124,15 @@ function __mount_image {
   sudo kpartx -av "${OPNFV_NBD_DEV}"
   # Hardcode partition index to 1, unlikely to change for Ubuntu UCA image
   sudo partx -uvn 1:1 "${OPNFV_NBD_DEV}"
-  if [[ "${MCP_OS:-}" =~ ubuntu1604 ]] && sudo growpart "${OPNFV_NBD_DEV}" 1
+  if [[ "${MCP_OS:-}" =~ ubuntu ]] && sudo growpart "${OPNFV_NBD_DEV}" 1
   then
+    if [ -e "${image_dir}/e2fsprogs" ]; then
+      E2FSCK_PREFIX="${image_dir}/e2fsprogs/e2fsck/"
+      RESIZE_PREFIX="${image_dir}/e2fsprogs/resize/"
+    fi
     sudo kpartx -u "${OPNFV_NBD_DEV}"
-    sudo e2fsck -pf "${OPNFV_MAP_DEV}"
-    sudo resize2fs "${OPNFV_MAP_DEV}"
+    sudo "${E2FSCK_PREFIX}e2fsck" -pf "${OPNFV_MAP_DEV}"
+    sudo "${RESIZE_PREFIX}resize2fs" "${OPNFV_MAP_DEV}"
   else
     sleep 5 # /dev/nbdNp1 takes some time to come up
   fi
diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml
index 032aa1146..73374b6ef 100644
--- a/mcp/scripts/requirements_deb.yaml
+++ b/mcp/scripts/requirements_deb.yaml
@@ -14,6 +14,7 @@ deploy:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
     - bridge-utils
+    - build-essential
     - cloud-guest-utils
     - cpu-checker
     - curl
@@ -23,7 +24,6 @@ deploy:
     - kpartx
     - libglib2.0-bin
     - libvirt-bin
-    - make
     - mkisofs
     - qemu-kvm
     - rsync
-- 
cgit 1.2.3-korg