YunoHost/package_check
1
0
Fork 0
mirror of https://github.com/YunoHost/package_check.git synced 2024-09-03 20:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

another fix for swapfiles

Browse source
This commit is contained in:
Kay0u 2021-02-04 14:24:29 +01:00
parent 7a0abea251
commit ab28b10f81
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/lxc.sh
View file

@ -39,8 +39,7 @@ CREATE_LXC_SNAPSHOT () {
check_witness_files >&2 check_witness_files >&2
# Remove swap files to avoid killing the CI with huge snapshots. # Remove swap files to avoid killing the CI with huge snapshots.
lxc exec $LXC_NAME -- bash -c 'for swapfile in $(ls /swap_* 2>/dev/null); do swapoff $swapfile; done' CLEAN_SWAPFILES
lxc exec $LXC_NAME -- bash -c 'for swapfile in $(ls /swap_* 2>/dev/null); do rm -f $swapfile; done'
timeout 30 lxc stop --timeout 15 $LXC_NAME 2>/dev/null timeout 30 lxc stop --timeout 15 $LXC_NAME 2>/dev/null
@ -61,8 +60,7 @@ LOAD_LXC_SNAPSHOT () {
log_debug "Loading snapshot $snapname ..." log_debug "Loading snapshot $snapname ..."
# Remove swap files before restoring the snapshot. # Remove swap files before restoring the snapshot.
lxc exec $LXC_NAME -- bash -c 'for swapfile in $(ls /swap_* 2>/dev/null); do swapoff $swapfile; done' 2>/dev/null CLEAN_SWAPFILES
lxc exec $LXC_NAME -- bash -c 'for swapfile in $(ls /swap_* 2>/dev/null); do rm -f $swapfile; done' 2>/dev/null
timeout 30 lxc stop --timeout 15 $LXC_NAME 2>/dev/null timeout 30 lxc stop --timeout 15 $LXC_NAME 2>/dev/null
lxc restore $LXC_NAME $snapname lxc restore $LXC_NAME $snapname
@ -100,9 +98,13 @@ LXC_STOP () {
} }
LXC_RESET () { LXC_RESET () {
# If the container exists
if lxc info $LXC_NAME >/dev/null 2>/dev/null; then
# Remove swap files before deletting the continer
CLEAN_SWAPFILES
fi
timeout 30 lxc stop --timeout 15 $LXC_NAME --force 2>/dev/null timeout 30 lxc stop --timeout 15 $LXC_NAME --force 2>/dev/null
swapoff /var/snap/lxd/common/lxd/containers/$LXC_NAME/rootfs/swap_* 2>/dev/null
swapoff /var/lib/lxd/containers/$LXC_NAME/rootfs/swap_* 2>/dev/null
lxc delete $LXC_NAME --force 2>/dev/null lxc delete $LXC_NAME --force 2>/dev/null
} }
@ -174,8 +176,17 @@ _LXC_START_AND_WAIT() {
LXC_IP=$(lxc exec $1 -- hostname -I | grep -E -o "\<[0-9.]{8,}\>") LXC_IP=$(lxc exec $1 -- hostname -I | grep -E -o "\<[0-9.]{8,}\>")
} }
CLEAN_SWAPFILES() {
RUN_INSIDE_LXC() { # Restart it if needed
lxc exec $LXC_NAME -- $@ if [ "$(lxc info $LXC_NAME | grep Status | awk '{print $2}')" != "Running" ]; then
lxc start $LXC_NAME
_LXC_START_AND_WAIT $LXC_NAME
fi
lxc exec $LXC_NAME -- bash -c 'for swapfile in $(ls /swap_* 2>/dev/null); do swapoff $swapfile; done'
lxc exec $LXC_NAME -- bash -c 'for swapfile in $(ls /swap_* 2>/dev/null); do rm -f $swapfile; done'
}
RUN_INSIDE_LXC() {
lxc exec $LXC_NAME -- "$@"
} }