gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

irqbalance_mck: replace extra service with service drop-in

Browse Source 
Using a drop-in instead of an extra service avoids having to juggle
between both services (especially since irqbalance_mck did not have a
Conflict=irqbalance.service statement)

That way, we only have a single service to check for (irqbalance.service),
and system administrators should find this less confusing if they normally
rely on irqbalance.

The drop-in is also installed in /run so will automatically disappear in
the event of a linux crash or a reboot without shutting down mckernel

Change-Id: I004f4f25d9ca037e411e0bc91f4555db138ecfef
This commit is contained in:
Dominique Martinet
2019-03-11 18:17:31 +09:00
parent 2dc51530f3
commit dfb3bef96d
6 changed files with 48 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/mcstop+release-smp.sh.in
View File

@@ -17,7 +17,6 @@ KERNDIR="@KERNDIR@"
mem=""
cpus=""
irqbalance_used=""
kill_in_use=""
while getopts k OPT
@@ -36,24 +35,11 @@ if [[ "$#" -ge "$OPTIND" ]]; then
exit 1
fi
disable_irqbalance_mck() {
if [ -f /etc/systemd/system/irqbalance_mck.service ]; then
sudo systemctl disable irqbalance_mck.service >/dev/null 2>/dev/null
# Invalid .service file persists so remove it
rm -f /etc/systemd/system/irqbalance_mck.service
fi
}
# No SMP module? Exit.
if ! grep ihk_smp_@ARCH@ /proc/modules &>/dev/null; then exit 0; fi
if [ "`systemctl status irqbalance_mck.service 2> /dev/null |grep -E 'Active: active'`" != "" ]; then
irqbalance_used="yes"
if ! sudo systemctl stop irqbalance_mck.service 2>/dev/null; then
echo "warning: failed to stop irqbalance_mck" >&2
fi
disable_irqbalance_mck
if [[ -f /run/systemd/system/irqbalance.service.d/mckernel.conf ]]; then
sudo systemctl stop irqbalance 2>/dev/null
fi
# Destroy all LWK instances
@@ -152,15 +138,15 @@ if [ "${pid}" != "" ]; then
fi
# Start irqbalance with the original settings
if [ "${irqbalance_used}" != "" ]; then
if ! perl -e '$tmpdir="/tmp/mcreboot"; @files = grep { -f } glob "$tmpdir/proc/irq/*/smp_affinity"; foreach $file (@files) { $dest = substr($file, length($tmpdir)); if (0) {print "cp $file $dest\n";} system("sudo cp $file $dest 2>/dev/null"); }'; then
echo "warning: failed to restore /proc/irq/*/smp_affinity" >&2
fi
if [ -e /tmp/mcreboot ]; then rm -rf /tmp/mcreboot; fi
if [ -e /tmp/irqbalance_mck ]; then rm -f /tmp/irqbalance_mck; fi
if ! sudo systemctl start irqbalance.service; then
echo "warning: failed to start irqbalance" >&2;
fi
if [ -f /run/systemd/system/irqbalance.service.d/mckernel.conf ]; then
for f in /run/sysconfig/irqbalance_mck_affinities/proc/irq/*/smp_affinity; do
cat "$f" | sudo tee "${f#/run/sysconfig/irqbalance_mck_affinities}" >/dev/null 2>&1
done
sudo rm -rf /run/systemd/system/irqbalance.service.d/mckernel.conf \
/run/sysconfig/irqbalance_mck /run/sysconfig/irqbalance_mck_affinities
sudo rmdir /run/systemd/system/irqbalance.service.d 2>/dev/null
sudo systemctl daemon-reload
sudo systemctl restart irqbalance.service
fi
# Set back default swappiness