Merge branch 'ppid-watcher' into 'master'

Don't count on PID 1 to be the reaper

Closes gitlab-ce#35982

See merge request !270

3 files changed, 13 insertions, 8 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 083487970..a4e8111aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ UNRELEASED
 
 - Add GitLab-Shell Path to config
   https://gitlab.com/gitlab-org/gitaly/merge_requests/267
+- Don't count on PID 1 to be the reaper
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/270
 
 v0.28.0
 
diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go
index aff482bb6..558ce174c 100644
--- a/internal/rubyserver/rubyserver.go
+++ b/internal/rubyserver/rubyserver.go
@@ -1,6 +1,7 @@
 package rubyserver
 
 import (
+	"fmt"
 	"io/ioutil"
 	"net"
 	"os"
@@ -59,7 +60,7 @@ func prepareSocketPath() {
 func Start() (*supervisor.Process, error) {
 	lazyInit.Do(prepareSocketPath)
 
-	args := []string{"bundle", "exec", "bin/gitaly-ruby", socketPath}
+	args := []string{"bundle", "exec", "bin/gitaly-ruby", fmt.Sprintf("%d", os.Getpid()), socketPath}
 	return supervisor.New(nil, args, config.Config.Ruby.Dir)
 }
 
diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby
index 184610e5b..8b486601e 100755
--- a/ruby/bin/gitaly-ruby
+++ b/ruby/bin/gitaly-ruby
@@ -7,13 +7,15 @@ require 'grpc'
 require_relative '../lib/gitaly_server.rb'
 
 def main
-  if ARGV.length != 1
-    abort "Usage: #{$0} /path/to/socket"
+  if ARGV.length != 2
+    abort "Usage: #{$0} PPID /path/to/socket"
   end
+  ppid, socket_path = ARGV
 
-  start_parent_watcher
+  ppid_i = ppid.to_i
+  abort "invalid PPID: #{ppid.inspect}" unless ppid_i > 0
+  start_parent_watcher(ppid_i)
 
-  socket_path = ARGV.first
   FileUtils.rm_f(socket_path)
   socket_dir = File.dirname(socket_path)
   FileUtils.mkdir_p(socket_dir)
@@ -29,11 +31,11 @@ def main
   s.run_till_terminated
 end
 
-def start_parent_watcher
+def start_parent_watcher(original_ppid)
   Thread.new do
     loop do
-      if Process.ppid == 1
-        # If our parent is PID 1, our original parent is gone. Self-terminate.
+      if Process.ppid != original_ppid
+        # Our original parent is gone. Self-terminate.
         Process.kill(9, Process.pid)
       end