Force gitaly-ruby to run Ruby garbage collection

2 files changed, 12 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1ac74637..9acde24e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 UNRELEASED
 
+- Force gitaly-ruby to run Ruby garbage collection
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/631
 - Rewrite RepositoryService.HasLocalBranches in Go
   https://gitlab.com/gitlab-org/gitaly/merge_requests/629
 - Rewrite RepositoryService.MergeBase in Go
diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby
index 115e5b6d4..a2ae836bd 100755
--- a/ruby/bin/gitaly-ruby
+++ b/ruby/bin/gitaly-ruby
@@ -43,6 +43,7 @@ def main
 
   trap('TERM') { signal_thread.kill }
   start_parent_watcher(ppid_i, signal_thread)
+  start_gc_thread
 
   run_thread = Thread.new do
     s.run
@@ -68,4 +69,13 @@ def start_parent_watcher(original_ppid, signal_thread)
   end
 end
 
+def start_gc_thread
+  Thread.new do
+    loop do
+      GC.start
+      sleep 60
+    end
+  end
+end
+
 main