From 248e9d9ae7e593f140d55d857fef508c1af801fd Mon Sep 17 00:00:00 2001
From: Florian Staudacher <florian_staudacher@yahoo.de>
Date: Fri, 6 Apr 2012 01:16:37 +0200
Subject: [PATCH] add more output (swapping), increase swapfile size
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
---
script/ci/before.sh | 2 +-
spec/support/deferred_garbage_collection.rb | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/script/ci/before.sh b/script/ci/before.sh
index 4e48e425e1..58f4ed22ad 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 4461c9397b..fd6e5865ff 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
--
GitLab