summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2019-01-07 15:41:22 +0000
committerPMR <pmr@pmr-lander>2019-01-07 15:41:22 +0000
commit20857d05e4c44bb2f503c2b60fd5ace7b2dc82f9 (patch)
tree9b637c8068ccc068428e6ed3bedbf0d97116b24b
parentf60cac039edfb1337857878a96b5f9dd4450bc94 (diff)
parentefc78dd0509e6e915ffb3b988c80d85e84f54d74 (diff)
Merge #361244 from ~rodsmith/plainbox-provider-checkbox:fix-timeout-memory-stress-ng
Increase timeout in memory_stress_ng from 150% to 200% of expected run time
-rwxr-xr-xbin/memory_stress_ng4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/memory_stress_ng b/bin/memory_stress_ng
index 181404a..905ed50 100755
--- a/bin/memory_stress_ng
+++ b/bin/memory_stress_ng
@@ -70,9 +70,9 @@ get_params() {
# had_error -- sets to "1" if an error occurred
run_stressor() {
local runtime="$2"
- # Add 50% to runtime; will forcefully terminate if stress-ng
+ # Double runtime; will forcefully terminate if stress-ng
# fails to return in that time.
- end_time=$((runtime*15/10))
+ end_time=$((runtime*2))
echo "Running stress-ng $1 stressor for $2 seconds...."
logger -t "memory_stress_ng" "Running stress-ng $1 stressor for $2 seconds..."
# Use "timeout" command to launch stress-ng, to catch it should it go into la-la land