ARROW-4704: [GLib][CI] Ensure killing plasma_store_server

Author: Kouhei Sutou <[email protected]> Closes apache#3794 from kou/glib-plasma-test and squashes the following commits: 43f19b3 <Kouhei Sutou> Ensure killing plasma_store_server 8022faf <Kouhei Sutou> Ensure killing plasma_store_server
khwilson · Mar 3, 2019 · 95b33ef · 95b33ef
1 parent fd0e7ba
commit 95b33ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/c_glib/test/helper/plasma-store.rb b/c_glib/test/helper/plasma-store.rb
@@ -44,6 +44,13 @@ def start
     def stop
       return if @pid.nil?
       Process.kill(:TERM, @pid)
+      timeout = 1
+      limit = Time.now + timeout
+      while Time.now < limit
+        return if Process.waitpid(@pid, Process::WNOHANG)
+        sleep(0.1)
+      end
+      Process.kill(:KILL, @pid)
       Process.waitpid(@pid)
     end
   end

diff --git a/ruby/red-plasma/test/helper/plasma-store.rb b/ruby/red-plasma/test/helper/plasma-store.rb
@@ -44,6 +44,13 @@ def start
     def stop
       return if @pid.nil?
       Process.kill(:TERM, @pid)
+      timeout = 1
+      limit = Time.now + timeout
+      while Time.now < limit
+        return if Process.waitpid(@pid, Process::WNOHANG)
+        sleep(0.1)
+      end
+      Process.kill(:KILL, @pid)
       Process.waitpid(@pid)
     end
   end