diff --git a/script/ci/before.sh b/script/ci/before.sh index 4e48e425e1ef6b95007c5345ae1b98a54b555684..58f4ed22ad80e78fe247318fa4b9182308d7e544 100755 --- a/script/ci/before.sh +++ b/script/ci/before.sh @@ -14,7 +14,7 @@ sh -e /etc/init.d/xvfb start # setup swapfile echo "creating a swapfile" -sudo dd if=/dev/zero of=swapfile bs=1M count=64 +sudo dd if=/dev/zero of=swapfile bs=1M count=128 sudo mkswap swapfile sudo swapon swapfile diff --git a/spec/support/deferred_garbage_collection.rb b/spec/support/deferred_garbage_collection.rb index 4461c9397bc5b8360380dff817aa52adceb90d31..fd6e5865ffb43718de869704bc85729c1bc67b20 100644 --- a/spec/support/deferred_garbage_collection.rb +++ b/spec/support/deferred_garbage_collection.rb @@ -12,9 +12,9 @@ class DeferredGarbageCollection end def self.memory_threshold - mem = %x(free 2>/dev/null).to_s.split(" ") - return nil if mem.empty? - mem[8].to_i / (mem[7].to_i/100) + @mem = %x(free 2>/dev/null).to_s.split(" ") + return nil if @mem.empty? + @mem[8].to_i / (@mem[7].to_i/100) end def self.reconsider @@ -22,7 +22,11 @@ class DeferredGarbageCollection if (percent_used = self.memory_threshold) running_out_of_memory = percent_used > 90 - puts "percent memory used #{percent_used}" # just for info, as soon as we got some numbers remove it + + # just for info, as soon as we got some numbers remove it + swap_percent_used = @mem[19].to_i / (@mem[18].to_i/100) rescue 0 + puts "percent memory used #{percent_used} (#{@mem[8]} of #{@mem[7]})" + puts "percent swap used #{swap_percent_used} (#{@mem[19]} of #{@mem[18]})" else running_out_of_memory = false end