Revert "Revert "Move fix_disk_layout to an Ansible role in setup_host""
This re-introduces the Ansible role to set up the disk layout.
The initial introduction increased dramatically the occurrence of the
race condition involving the failure when configuring swap on /dev/xvde1 [1].
This (re)revert substitutes the sync and partprobe commands by a
udevadm settle command in order to wait until the device and it's partitions
are ready for use.
[1]: https://bugs.launchpad.net/openstack-gate/+bug/1706103
This reverts commit 71aa1bd6cf
.
Change-Id: Iac0efdb6077ab18c2e1991820da4fcea7642f708
This commit is contained in:
parent
71aa1bd6cf
commit
1d80845e5e
96
functions.sh
96
functions.sh
|
@ -303,100 +303,6 @@ function git_clone_and_cd {
|
|||
cd $short_project
|
||||
}
|
||||
|
||||
function fix_disk_layout {
|
||||
# Don't attempt to fix disk layout more than once
|
||||
[[ -e /etc/fixed_disk_layout ]] && return 0 || sudo touch /etc/fixed_disk_layout
|
||||
|
||||
# Ensure virtual machines from different providers all have at least 8GB of
|
||||
# swap.
|
||||
# Use an ephemeral disk if there is one or create and use a swapfile.
|
||||
# Rackspace also doesn't have enough space on / for two devstack installs,
|
||||
# so we partition the disk and mount it on /opt, syncing the previous
|
||||
# contents of /opt over.
|
||||
SWAPSIZE=8192
|
||||
swapcurrent=$(( $(grep SwapTotal /proc/meminfo | awk '{ print $2; }') / 1024 ))
|
||||
|
||||
if [[ $swapcurrent -lt $SWAPSIZE ]]; then
|
||||
if [ -b /dev/xvde ]; then
|
||||
DEV='/dev/xvde'
|
||||
else
|
||||
EPHEMERAL_DEV=$(blkid -L ephemeral0 || true)
|
||||
if [ -n "$EPHEMERAL_DEV" -a -b "$EPHEMERAL_DEV" ]; then
|
||||
DEV=$EPHEMERAL_DEV
|
||||
fi
|
||||
fi
|
||||
if [ -n "$DEV" ]; then
|
||||
# If an ephemeral device is available, use it
|
||||
local swap=${DEV}1
|
||||
local lvmvol=${DEV}2
|
||||
local optdev=${DEV}3
|
||||
if mount | grep ${DEV} > /dev/null; then
|
||||
echo "*** ${DEV} appears to already be mounted"
|
||||
echo "*** ${DEV} unmounting and reformating"
|
||||
sudo umount ${DEV}
|
||||
fi
|
||||
sudo parted ${DEV} --script -- mklabel msdos
|
||||
sudo parted ${DEV} --script -- mkpart primary linux-swap 1 ${SWAPSIZE}
|
||||
sudo parted ${DEV} --script -- mkpart primary ext2 8192 -1
|
||||
sync
|
||||
# Note: there's an issue with trusty that "partprobe" of
|
||||
# all devices fails on the RAX configdrive, which is a raw
|
||||
# iso9660 partition; hence keep the ${DEV} here for now
|
||||
sudo partprobe ${DEV}
|
||||
sudo mkswap ${DEV}1
|
||||
sudo mkfs.ext4 ${DEV}2
|
||||
sudo swapon ${DEV}1
|
||||
sudo mount ${DEV}2 /mnt
|
||||
sudo find /opt/ -mindepth 1 -maxdepth 1 -exec mv {} /mnt/ \;
|
||||
sudo umount /mnt
|
||||
sudo mount ${DEV}2 /opt
|
||||
|
||||
# Sanity check
|
||||
grep -q ${DEV}1 /proc/swaps || exit 1
|
||||
grep -q ${DEV}2 /proc/mounts || exit 1
|
||||
else
|
||||
# If no ephemeral devices are available, use root filesystem
|
||||
# Don't use sparse device to avoid wedging when disk space and
|
||||
# memory are both unavailable.
|
||||
local swapfile='/root/swapfile'
|
||||
sudo touch ${swapfile}
|
||||
swapdiff=$(( $SWAPSIZE - $swapcurrent ))
|
||||
|
||||
if sudo df -T ${swapfile} | grep -q ext ; then
|
||||
sudo fallocate -l ${swapdiff}M ${swapfile}
|
||||
else
|
||||
# Cannot fallocate on filesystems like XFS
|
||||
sudo dd if=/dev/zero of=${swapfile} bs=1M count=${swapdiff}
|
||||
fi
|
||||
sudo chmod 600 ${swapfile}
|
||||
sudo mkswap ${swapfile}
|
||||
sudo swapon ${swapfile}
|
||||
|
||||
# Sanity check
|
||||
grep -q ${swapfile} /proc/swaps || exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# dump vm settings for reference (Ubuntu 12 era procps can get
|
||||
# confused with certain proc trigger nodes that are write-only and
|
||||
# return a EPERM; ignore this)
|
||||
sudo sysctl vm || true
|
||||
|
||||
# ensure a standard level of swappiness. Some platforms
|
||||
# (rax+centos7) come with swappiness of 0 (presumably because the
|
||||
# vm doesn't come with swap setup ... but we just did that above),
|
||||
# which depending on the kernel version can lead to the OOM killer
|
||||
# kicking in on some processes despite swap being available;
|
||||
# particularly things like mysql which have very high ratio of
|
||||
# anonymous-memory to file-backed mappings.
|
||||
|
||||
# make sure reload of sysctl doesn't reset this
|
||||
sudo sed -i '/vm.swappiness/d' /etc/sysctl.conf
|
||||
# This sets swappiness low; we really don't want to be relying on
|
||||
# cloud I/O based swap during our runs
|
||||
sudo sysctl -w vm.swappiness=30
|
||||
}
|
||||
|
||||
# Set up a project in accordance with the future state proposed by
|
||||
# Zuul.
|
||||
#
|
||||
|
@ -499,8 +405,6 @@ function setup_workspace {
|
|||
return 1
|
||||
fi
|
||||
|
||||
fix_disk_layout
|
||||
|
||||
sudo mkdir -p $DEST
|
||||
sudo chown -R $USER:$USER $DEST
|
||||
|
||||
|
|
|
@ -0,0 +1,102 @@
|
|||
---
|
||||
# TODO: Turn this into proper Ansible
|
||||
- name: Fix the disk layout
|
||||
become: yes
|
||||
args:
|
||||
executable: /bin/bash
|
||||
creates: /etc/fixed_disk_layout
|
||||
shell: |
|
||||
set -ex
|
||||
# Don't attempt to fix disk layout more than once
|
||||
touch /etc/fixed_disk_layout
|
||||
|
||||
# Ensure virtual machines from different providers all have at least 8GB of
|
||||
# swap.
|
||||
# Use an ephemeral disk if there is one or create and use a swapfile.
|
||||
# Rackspace also doesn't have enough space on / for two devstack installs,
|
||||
# so we partition the disk and mount it on /opt, syncing the previous
|
||||
# contents of /opt over.
|
||||
SWAPSIZE=8192
|
||||
swapcurrent=$(( $(grep SwapTotal /proc/meminfo | awk '{ print $2; }') / 1024 ))
|
||||
|
||||
if [[ $swapcurrent -lt $SWAPSIZE ]]; then
|
||||
if [ -b /dev/xvde ]; then
|
||||
DEV='/dev/xvde'
|
||||
else
|
||||
EPHEMERAL_DEV=$(blkid -L ephemeral0 || true)
|
||||
if [ -n "$EPHEMERAL_DEV" -a -b "$EPHEMERAL_DEV" ]; then
|
||||
DEV=$EPHEMERAL_DEV
|
||||
fi
|
||||
fi
|
||||
if [ -n "$DEV" ]; then
|
||||
# If an ephemeral device is available, use it
|
||||
swap=${DEV}1
|
||||
lvmvol=${DEV}2
|
||||
optdev=${DEV}3
|
||||
if mount | grep ${DEV} > /dev/null; then
|
||||
echo "*** ${DEV} appears to already be mounted"
|
||||
echo "*** ${DEV} unmounting and reformating"
|
||||
umount ${DEV}
|
||||
fi
|
||||
parted ${DEV} --script -- mklabel msdos
|
||||
parted ${DEV} --script -- mkpart primary linux-swap 1 ${SWAPSIZE}
|
||||
parted ${DEV} --script -- mkpart primary ext2 8192 -1
|
||||
|
||||
# The device partitions might not show up immediately, make sure
|
||||
# they are ready and available for use
|
||||
udevadm settle --timeout=0 || echo "Block device not ready yet. Waiting for up to 10 seconds for it to be ready"
|
||||
udevadm settle --timeout=10 --exit-if-exists=${DEV}1
|
||||
udevadm settle --timeout=10 --exit-if-exists=${DEV}2
|
||||
|
||||
mkswap ${DEV}1
|
||||
mkfs.ext4 ${DEV}2
|
||||
swapon ${DEV}1
|
||||
mount ${DEV}2 /mnt
|
||||
find /opt/ -mindepth 1 -maxdepth 1 -exec mv {} /mnt/ \;
|
||||
umount /mnt
|
||||
mount ${DEV}2 /opt
|
||||
|
||||
# Sanity check
|
||||
grep -q ${DEV}1 /proc/swaps || exit 1
|
||||
grep -q ${DEV}2 /proc/mounts || exit 1
|
||||
else
|
||||
# If no ephemeral devices are available, use root filesystem
|
||||
# Don't use sparse device to avoid wedging when disk space and
|
||||
# memory are both unavailable.
|
||||
swapfile='/root/swapfile'
|
||||
touch ${swapfile}
|
||||
swapdiff=$(( $SWAPSIZE - $swapcurrent ))
|
||||
|
||||
if df -T ${swapfile} | grep -q ext ; then
|
||||
fallocate -l ${swapdiff}M ${swapfile}
|
||||
else
|
||||
# Cannot fallocate on filesystems like XFS
|
||||
dd if=/dev/zero of=${swapfile} bs=1M count=${swapdiff}
|
||||
fi
|
||||
chmod 600 ${swapfile}
|
||||
mkswap ${swapfile}
|
||||
swapon ${swapfile}
|
||||
|
||||
# Sanity check
|
||||
grep -q ${swapfile} /proc/swaps || exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# dump vm settings for reference (Ubuntu 12 era procps can get
|
||||
# confused with certain proc trigger nodes that are write-only and
|
||||
# return a EPERM; ignore this)
|
||||
sysctl vm || true
|
||||
|
||||
# ensure a standard level of swappiness. Some platforms
|
||||
# (rax+centos7) come with swappiness of 0 (presumably because the
|
||||
# vm doesn't come with swap setup ... but we just did that above),
|
||||
# which depending on the kernel version can lead to the OOM killer
|
||||
# kicking in on some processes despite swap being available;
|
||||
# particularly things like mysql which have very high ratio of
|
||||
# anonymous-memory to file-backed mappings.
|
||||
|
||||
# make sure reload of sysctl doesn't reset this
|
||||
sed -i '/vm.swappiness/d' /etc/sysctl.conf
|
||||
# This sets swappiness low; we really don't want to be relying on
|
||||
# cloud I/O based swap during our runs
|
||||
sysctl -w vm.swappiness=30
|
|
@ -6,6 +6,7 @@
|
|||
roles:
|
||||
- gather_host_info
|
||||
- fix_etc_hosts
|
||||
- fix_disk_layout
|
||||
- create_base_folder
|
||||
- start_fresh_logging
|
||||
- setup_stack_user
|
||||
|
|
Loading…
Reference in New Issue