gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

earlyoom: Stop using unsupported -k option

Browse Source
This commit is contained in:
Michael Vines
2019-05-01 10:52:02 -07:00
parent 5e9638aae0
commit 7fec1f38be
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/scripts/install-earlyoom.sh
View File

@ -18,8 +18,8 @@ else
apt install --quiet --yes ./earlyoom_1.2-*_amd64.deb apt install --quiet --yes ./earlyoom_1.2-*_amd64.deb
cat > earlyoom <<OOM cat > earlyoom <<OOM
# use the kernel OOM killer, trigger at 20% available RAM, # trigger at 20% available RAM,
EARLYOOM_ARGS="-k -m 20" EARLYOOM_ARGS="-m 20"
OOM OOM
cp earlyoom /etc/default/ cp earlyoom /etc/default/
rm earlyoom rm earlyoom

2
scripts/oom-monitor.sh
View File

@ -30,7 +30,7 @@ while read -r victim; do
./metrics-write-datapoint.sh "oom-killer,victim=$victim,hostname=$HOSTNAME killed=1" ./metrics-write-datapoint.sh "oom-killer,victim=$victim,hostname=$HOSTNAME killed=1"
done < <( \ done < <( \
tail --follow=name --retry -n0 $syslog \ tail --follow=name --retry -n0 $syslog \
| sed --unbuffered -n 's/^.* Out of memory: Kill process [1-9][0-9]* (\([^)]*\)) .*/\1/p' \ | sed --unbuffered -n "s/^.* earlyoom\[[0-9]*\]: Killing process .\(.*\). with signal .*/\1/p" \
) )
exit 1 exit 1