Commit 60dca399 authored by intrigeri's avatar intrigeri
Browse files

Set the remote shell's OOM score adjustment value via its unit file, instead...

Set the remote shell's OOM score adjustment value via its unit file, instead of dynamically at test suite run time.
parent 6e411b1b
...@@ -7,6 +7,7 @@ Before=gdm.service ...@@ -7,6 +7,7 @@ Before=gdm.service
[Service] [Service]
Type=notify Type=notify
ExecStart=/usr/local/lib/tails-autotest-remote-shell /dev/ttyS0 ExecStart=/usr/local/lib/tails-autotest-remote-shell /dev/ttyS0
OOMScoreAdjust=-1000
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
...@@ -128,12 +128,6 @@ Given /^I fill the guest's memory with a known pattern(| without verifying)$/ do ...@@ -128,12 +128,6 @@ Given /^I fill the guest's memory with a known pattern(| without verifying)$/ do
$vm.execute_successfully("sysctl #{key}=#{val}") $vm.execute_successfully("sysctl #{key}=#{val}")
end end
# The remote shell is sometimes OOM killed when we fill the memory,
# and since we depend on it after the memory fill we try to prevent
# that from happening.
pid = $vm.pidof("tails-autotest-remote-shell")[0]
$vm.execute_successfully("echo '-1000' > /proc/#{pid}/oom_score_adj")
# We exclude the memory we reserve for the kernel and admin # We exclude the memory we reserve for the kernel and admin
# processes above from the free memory since fillram will be run by # processes above from the free memory since fillram will be run by
# an unprivileged user in user-space. # an unprivileged user in user-space.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment