mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-27 15:57:09 +00:00
osbuilder: fix loop devices manipulation in image-builder.sh
Improve image-builder.sh to avoid the sporadic failures observed during the CI builds of images. Also, some cosmetic changes to indentation. Fixes: #172 Signed-off-by: Marco Vedovati <mvedovati@suse.com>
This commit is contained in:
Marco Vedovati
parent
d5087c07ca
commit
4a2fdee972
@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 Intel Corporation
|
# Copyright (c) 2017 Intel Corporation
|
||||||
#
|
#
|
||||||
@ -26,9 +26,9 @@ usage()
|
|||||||
cat <<EOT
|
cat <<EOT
|
||||||
Usage: ${script_name} [options] <rootfs-dir>
|
Usage: ${script_name} [options] <rootfs-dir>
|
||||||
This script will create a Kata Containers image file of
|
This script will create a Kata Containers image file of
|
||||||
an adequate size based on the <rootfs-dir> directory.
|
an adequate size based on the <rootfs-dir> directory.
|
||||||
The size of the image can be also be specified manually
|
The size of the image can be also be specified manually
|
||||||
by '-s' flag.
|
by '-s' flag.
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
-h Show this help
|
-h Show this help
|
||||||
@ -63,15 +63,17 @@ do
|
|||||||
h) usage ;;
|
h) usage ;;
|
||||||
o) IMAGE="${OPTARG}" ;;
|
o) IMAGE="${OPTARG}" ;;
|
||||||
r) ROOT_FREE_SPACE="${OPTARG}" ;;
|
r) ROOT_FREE_SPACE="${OPTARG}" ;;
|
||||||
s) IMG_SIZE=${OPTARG}
|
s) {
|
||||||
if [ ${IMG_SIZE} -le 0 ]; then
|
IMG_SIZE=${OPTARG}
|
||||||
die "Image size has to be greater than 0 MB."
|
if [ ${IMG_SIZE} -le 0 ]; then
|
||||||
fi
|
die "Image size has to be greater than 0 MB."
|
||||||
if [ ${IMG_SIZE} -gt ${MAX_IMG_SIZE_MB} ]; then
|
fi
|
||||||
die "Image size should not be greater than ${MAX_IMG_SIZE_MB} MB."
|
if [ ${IMG_SIZE} -gt ${MAX_IMG_SIZE_MB} ]; then
|
||||||
fi
|
die "Image size should not be greater than ${MAX_IMG_SIZE_MB} MB."
|
||||||
;;
|
fi
|
||||||
f) FS_TYPE="${OPTARG}" ;;
|
}
|
||||||
|
;;
|
||||||
|
f) FS_TYPE="${OPTARG}" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -140,94 +142,131 @@ OLD_IMG_SIZE=0
|
|||||||
|
|
||||||
align_memory()
|
align_memory()
|
||||||
{
|
{
|
||||||
remaining=$(($IMG_SIZE % $MEM_BOUNDARY))
|
remaining=$(($IMG_SIZE % $MEM_BOUNDARY))
|
||||||
if [ "$remaining" != "0" ];then
|
if [ "$remaining" != "0" ];then
|
||||||
warning "image size '$IMG_SIZE' is not aligned to memory boundary '$MEM_BOUNDARY', aligning it"
|
warning "image size '$IMG_SIZE' is not aligned to memory boundary '$MEM_BOUNDARY', aligning it"
|
||||||
IMG_SIZE=$(($IMG_SIZE + $MEM_BOUNDARY - $remaining))
|
IMG_SIZE=$(($IMG_SIZE + $MEM_BOUNDARY - $remaining))
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Calculate image size based on the rootfs
|
# Calculate image size based on the rootfs
|
||||||
calculate_img_size()
|
calculate_img_size()
|
||||||
{
|
{
|
||||||
IMG_SIZE=${IMG_SIZE:-$MEM_BOUNDARY}
|
IMG_SIZE=${IMG_SIZE:-$MEM_BOUNDARY}
|
||||||
align_memory
|
align_memory
|
||||||
if [ -n "$ROOT_FREE_SPACE" ] && [ "$IMG_SIZE" -gt "$ROOTFS_SIZE" ]; then
|
if [ -n "$ROOT_FREE_SPACE" ] && [ "$IMG_SIZE" -gt "$ROOTFS_SIZE" ]; then
|
||||||
info "Ensure that root partition has at least ${ROOT_FREE_SPACE}MB of free space"
|
info "Ensure that root partition has at least ${ROOT_FREE_SPACE}MB of free space"
|
||||||
IMG_SIZE=$(($IMG_SIZE + $ROOT_FREE_SPACE))
|
IMG_SIZE=$(($IMG_SIZE + $ROOT_FREE_SPACE))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Cleanup
|
unmount()
|
||||||
cleanup()
|
|
||||||
{
|
{
|
||||||
sync
|
sync
|
||||||
umount -l ${MOUNT_DIR}
|
umount -l ${MOUNT_DIR}
|
||||||
rmdir ${MOUNT_DIR}
|
rmdir ${MOUNT_DIR}
|
||||||
fsck -D -y "${DEVICE}p1"
|
|
||||||
losetup -d "${DEVICE}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
detach()
|
||||||
|
{
|
||||||
|
losetup -d "${DEVICE}"
|
||||||
|
|
||||||
|
# From `man losetup` about -d option:
|
||||||
|
# Note that since Linux v3.7 kernel uses "lazy device destruction".
|
||||||
|
# The detach operation does not return EBUSY error anymore if
|
||||||
|
# device is actively used by system, but it is marked by autoclear
|
||||||
|
# flag and destroyed later
|
||||||
|
info "Waiting for ${DEVICE} to detach"
|
||||||
|
|
||||||
|
local i=0
|
||||||
|
local max_tries=5
|
||||||
|
while [[ "$i" < "$max_tries" ]]; do
|
||||||
|
sleep 1
|
||||||
|
# If either the 'p1' partition has disappeared or partprobe failed, then
|
||||||
|
# the loop device should be correctly detached
|
||||||
|
if ! [ -b "${DEVICE}p1" ] || ! partprobe -s ${DEVICE}; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
((i+=1))
|
||||||
|
echo -n "."
|
||||||
|
done
|
||||||
|
|
||||||
|
[[ "$i" == "$max_tries" ]] && die "Cannot detach ${DEVICE}"
|
||||||
|
info "detached"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
create_rootfs_disk()
|
create_rootfs_disk()
|
||||||
{
|
{
|
||||||
ATTEMPT_NUM=$(($ATTEMPT_NUM+1))
|
ATTEMPT_NUM=$(($ATTEMPT_NUM+1))
|
||||||
info "Create root disk image. Attempt ${ATTEMPT_NUM} out of ${MAX_ATTEMPTS}."
|
info "Create root disk image. Attempt ${ATTEMPT_NUM} out of ${MAX_ATTEMPTS}."
|
||||||
if [ ${ATTEMPT_NUM} -gt ${MAX_ATTEMPTS} ]; then
|
if [ ${ATTEMPT_NUM} -gt ${MAX_ATTEMPTS} ]; then
|
||||||
die "Unable to create root disk image."
|
die "Unable to create root disk image."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
calculate_img_size
|
calculate_img_size
|
||||||
if [ ${OLD_IMG_SIZE} -ne 0 ]; then
|
if [ ${OLD_IMG_SIZE} -ne 0 ]; then
|
||||||
info "Image size ${OLD_IMG_SIZE}MB too small, trying again with size ${IMG_SIZE}MB"
|
info "Image size ${OLD_IMG_SIZE}MB too small, trying again with size ${IMG_SIZE}MB"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
info "Creating raw disk with size ${IMG_SIZE}M"
|
info "Creating raw disk with size ${IMG_SIZE}M"
|
||||||
qemu-img create -q -f raw "${IMAGE}" "${IMG_SIZE}M"
|
qemu-img create -q -f raw "${IMAGE}" "${IMG_SIZE}M"
|
||||||
OK "Image file created"
|
OK "Image file created"
|
||||||
|
|
||||||
# Kata runtime expect an image with just one partition
|
# Kata runtime expect an image with just one partition
|
||||||
# The partition is the rootfs content
|
# The partition is the rootfs content
|
||||||
|
|
||||||
info "Creating partitions"
|
info "Creating partitions"
|
||||||
parted "${IMAGE}" --script "mklabel gpt" \
|
parted "${IMAGE}" --script "mklabel gpt" \
|
||||||
"mkpart ${FS_TYPE} 1M -1M"
|
"mkpart ${FS_TYPE} 1M -1M"
|
||||||
OK "Partitions created"
|
OK "Partitions created"
|
||||||
|
|
||||||
# Get the loop device bound to the image file (requires /dev mounted in the
|
# Get the loop device bound to the image file (requires /dev mounted in the
|
||||||
# image build system and root privileges)
|
# image build system and root privileges)
|
||||||
DEVICE=$(losetup -P -f --show "${IMAGE}")
|
DEVICE=$(losetup -P -f --show "${IMAGE}")
|
||||||
|
|
||||||
#Refresh partition table
|
#Refresh partition table
|
||||||
partprobe "${DEVICE}"
|
partprobe -s "${DEVICE}"
|
||||||
|
# Poll for the block device p1
|
||||||
|
local i=0
|
||||||
|
local max_tries=5
|
||||||
|
while [[ "$i" < "$max_tries" ]]; do
|
||||||
|
[ -b "${DEVICE}p1" ] && break
|
||||||
|
((i+=1))
|
||||||
|
echo -n "."
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
[[ "$i" == "$max_tries" ]] && die "File ${DEVICE}p1 is not a block device"
|
||||||
|
|
||||||
MOUNT_DIR=$(mktemp -d osbuilder-mount-dir.XXXX)
|
MOUNT_DIR=$(mktemp -d osbuilder-mount-dir.XXXX)
|
||||||
info "Formating Image using ext4 format"
|
info "Formatting Image using ext4 filesystem"
|
||||||
mkfs.ext4 -q -F -b "${BLOCK_SIZE}" "${DEVICE}p1"
|
mkfs.ext4 -q -F -b "${BLOCK_SIZE}" "${DEVICE}p1"
|
||||||
OK "Image formated"
|
OK "Image formatted"
|
||||||
|
|
||||||
info "Mounting root partition"
|
info "Mounting root partition"
|
||||||
mount "${DEVICE}p1" "${MOUNT_DIR}"
|
mount "${DEVICE}p1" "${MOUNT_DIR}"
|
||||||
OK "root partition mounted"
|
OK "root partition mounted"
|
||||||
RESERVED_BLOCKS_PERCENTAGE=3
|
RESERVED_BLOCKS_PERCENTAGE=3
|
||||||
info "Set filesystem reserved blocks percentage to ${RESERVED_BLOCKS_PERCENTAGE}%"
|
info "Set filesystem reserved blocks percentage to ${RESERVED_BLOCKS_PERCENTAGE}%"
|
||||||
tune2fs -m "${RESERVED_BLOCKS_PERCENTAGE}" "${DEVICE}p1"
|
tune2fs -m "${RESERVED_BLOCKS_PERCENTAGE}" "${DEVICE}p1"
|
||||||
|
|
||||||
AVAIL_DISK=$(df -B M --output=avail "${DEVICE}p1" | tail -1)
|
AVAIL_DISK=$(df -B M --output=avail "${DEVICE}p1" | tail -1)
|
||||||
AVAIL_DISK=${AVAIL_DISK/M}
|
AVAIL_DISK=${AVAIL_DISK/M}
|
||||||
info "Free space root partition ${AVAIL_DISK} MB"
|
info "Free space root partition ${AVAIL_DISK} MB"
|
||||||
|
|
||||||
# if the available disk space is less than rootfs size, repeat the process
|
# if the available disk space is less than rootfs size, repeat the process
|
||||||
# of disk creation by adding 5% in the inital assumed value $ROOTFS_SIZE
|
# of disk creation by adding 5% in the inital assumed value $ROOTFS_SIZE
|
||||||
if [ $ROOTFS_SIZE -gt $AVAIL_DISK ]; then
|
if [ $ROOTFS_SIZE -gt $AVAIL_DISK ]; then
|
||||||
# Increase the size but remain aligned to 128
|
# Increase the size but remain aligned to 128
|
||||||
MEM_BOUNDARY=$(($MEM_BOUNDARY+128))
|
MEM_BOUNDARY=$(($MEM_BOUNDARY+128))
|
||||||
rm -f ${IMAGE}
|
OLD_IMG_SIZE=${IMG_SIZE}
|
||||||
OLD_IMG_SIZE=${IMG_SIZE}
|
unset IMG_SIZE
|
||||||
unset IMG_SIZE
|
unmount
|
||||||
cleanup
|
detach
|
||||||
create_rootfs_disk
|
rm -f ${IMAGE}
|
||||||
fi
|
create_rootfs_disk
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
create_rootfs_disk
|
create_rootfs_disk
|
||||||
@ -237,6 +276,9 @@ info "Copying content from rootfs to root partition"
|
|||||||
cp -a "${ROOTFS}"/* ${MOUNT_DIR}
|
cp -a "${ROOTFS}"/* ${MOUNT_DIR}
|
||||||
OK "rootfs copied"
|
OK "rootfs copied"
|
||||||
|
|
||||||
cleanup
|
unmount
|
||||||
|
# Optimize
|
||||||
|
fsck.ext4 -D -y "${DEVICE}p1"
|
||||||
|
detach
|
||||||
|
|
||||||
info "Image created. Virtual size: ${IMG_SIZE}MB."
|
info "Image created. Virtual size: ${IMG_SIZE}MB."
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user