[PR 1952] 2st verification - updated tests & GitHub Actions

.github/workflows/workflow.yml

@@ -0,0 +1,69 @@
+name: Puma
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    name: >-
+      OS: ${{ matrix.os }}  Ruby: ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ 'ubuntu-16.04', 'ubuntu-18.04', 'macos', 'windows-latest' ]
+        ruby: [ '2.3.x', '2.4.x', '2.5.x', '2.6.x' ]
+        exclude:
+        - os: ubuntu-16.04
+          ruby: 2.4.x
+        - os: ubuntu-16.04
+          ruby: 2.5.x
+        - os: ubuntu-16.04
+          ruby: 2.6.x
+        - os: ubuntu-18.04
+          ruby: 2.3.x
+        - os: macos
+          ruby: 2.3.x
+        - os: windows-latest
+          ruby: 2.3.x
+    steps:
+    - name: repo checkout
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 10
+    - name: load ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: ubuntu & macos - install ragel
+      if:   startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
+      run:  |
+        if [ "${{ matrix.os }}" == "macos" ]; then
+          brew install ragel
+        else
+          sudo apt-get install ragel
+        fi
+    - name: windows - update MSYS2, openssl, ragel
+      if:   startsWith(matrix.os, 'windows')
+      uses: MSP-Greg/msys2-action@master
+      with:
+        base:  update
+        mingw: openssl ragel
+
+    - name: RubyGems, Bundler Update
+      run:  gem update --system --no-document --conservative
+    - name: bundle install
+      run:  bundle install --jobs 4 --retry 3
+    - name: compile
+      run:  bundle exec rake compile
+    - name: test
+      run:  bundle exec rake
+      env:
+        CI: true
+        TESTOPTS: -v

.travis.yml

@@ -45,7 +45,7 @@ matrix:
       env: OS="Bionic 18.04 OpenSSL 1.1.1"
     - rvm: ruby-head
       env: jit=yes
-    - rvm: 2.4.7
+    - rvm: 2.4.6
       os: osx
       osx_image: xcode11
       env: OS="osx xcode11"

lib/puma/binder.rb

@@ -50,14 +50,6 @@ def env(sock)
 
     def close
       @ios.each { |i| i.close }
-      @unix_paths.each do |i|
-        # Errno::ENOENT is intermittently raised
-        begin
-          unix_socket = UNIXSocket.new i
-          unix_socket.close
-        rescue Errno::ENOENT
-        end
-      end
     end
 
     def import_from_env

lib/puma/cluster.rb

@@ -68,7 +68,7 @@ def initialize(idx, pid, phase, options)
         @pid = pid
         @phase = phase
         @stage = :started
-        @signal = "TERM"
+        @signal = :TERM
         @options = options
         @first_term_sent = nil
         @started_at = Time.now
@@ -92,10 +92,6 @@ def term?
         @term
       end
 
-      def term?
-        @term
-      end
-
       def ping!(status)
         @last_checkin = Time.now
         @last_status = status
@@ -108,7 +104,7 @@ def ping_timeout?(which)
       def term
         begin
           if @first_term_sent && (Time.now - @first_term_sent) > @options[:worker_shutdown_timeout]
-            @signal = "KILL"
+            @signal = :KILL
           else
             @term ||= true
             @first_term_sent ||= Time.now
@@ -119,12 +115,12 @@ def term
       end
 
       def kill
-        Process.kill "KILL", @pid
+        Process.kill :KILL, @pid
       rescue Errno::ESRCH
       end
 
       def hup
-        Process.kill "HUP", @pid
+        Process.kill :HUP, @pid
       rescue Errno::ESRCH
       end
     end
@@ -220,8 +216,10 @@ def check_workers(force=false)
             log "- Stopping #{w.pid} for phased upgrade..."
           end
 
-          w.term
-          log "- #{w.signal} sent to #{w.pid}..."
+          unless w.term?
+            w.term
+            log "- #{w.signal} sent to #{w.pid}..."
+          end
         end
       end
     end
@@ -270,6 +268,7 @@ def worker(index, master)
       server = start_server
 
       Signal.trap "SIGTERM" do
+        @worker_write << "e#{Process.pid}\n" rescue nil
         server.stop
       end
 
@@ -501,8 +500,10 @@ def run
                   w.boot!
                   log "- Worker #{w.index} (pid: #{pid}) booted, phase: #{w.phase}"
                   force_check = true
+                when "e"
+                  w.instance_variable_set :@term, true
                 when "t"
-                  w.term
+                  w.term unless w.term?
                   force_check = true
                 when "p"
                   w.ping!(result.sub(/^\d+/,'').chomp)

lib/puma/launcher.rb

@@ -217,11 +217,12 @@ def restart_args
     end
 
     def close_binder_listeners
-      @binder.listeners.each do |l, io|
-        io.close
+      # close binder listeners as fast as possible, so separate loop
+      @binder.listeners.each { |_, io| io.close }
+      @binder.listeners.each do |l, _|
         uri = URI.parse(l)
         next unless uri.scheme == 'unix'
-        File.unlink("#{uri.host}#{uri.path}")
+        File.unlink "#{uri.host}#{uri.path}"
       end
     end
 

test/config/worker_shutdown_timeout_2.rb

@@ -0,0 +1 @@
+worker_shutdown_timeout 2

test/helper.rb

@@ -47,7 +47,11 @@ module UniquePort
   @mutex = Mutex.new
 
   def self.call
-    @mutex.synchronize { @port += 1 }
+    @mutex.synchronize {
+      @port += 1
+      @port = 3307 if @port == 3306  # MySQL on Actions
+      @port
+    }
   end
 end
 
@@ -70,6 +74,34 @@ def run(*)
 
 module TestSkips
 
+  # finds bad signals, value is an array of symbols
+  BAD_SIGNAL_LIST = begin
+    code = <<-HEREDOC
+      data = (%w[HUP INT TTIN TTOU USR1 USR2] - Signal.list.keys).join(' ')
+
+      begin
+        Signal.trap('TERM') { }
+      rescue ArgumentError
+        data << 'TERM'
+      end
+
+      puts data
+    HEREDOC
+    pipe = IO.popen RbConfig.ruby, 'r+'
+    pid = pipe.pid
+    pipe.puts code
+    pipe.close_write
+
+    begin
+      Process.kill :TERM, pid
+      pipe.read.strip.split(' ').sort.map(&:to_sym)
+    rescue Errno::EINVAL
+      "#{pipe.read.strip} TERM".split(' ').sort.map(&:to_sym)
+    ensure
+      Process.wait pid
+    end
+  end
+
   # usage: skip NO_FORK_MSG unless HAS_FORK
   # windows >= 2.6 fork is not defined, < 2.6 fork raises NotImplementedError
   HAS_FORK = ::Process.respond_to? :fork
@@ -82,8 +114,8 @@ module TestSkips
 
   # usage: skip_unless_signal_exist? :USR2
   def skip_unless_signal_exist?(sig, bt: caller)
-    signal = sig.to_s
-    unless Signal.list.key? signal
+    signal = sig.to_s.sub(/\ASIG/i, '').to_sym
+    if BAD_SIGNAL_LIST.include? signal
       skip "Signal #{signal} isn't available on the #{RUBY_PLATFORM} platform", bt
     end
   end

test/helpers/apps.rb

@@ -9,4 +9,12 @@ module TestApps
     [200, {"Content-Type" => "text/plain"}, ["Slept #{dly}"]]
   end
 
+  # call with "GET /sleep<d> HTTP/1.1\r\n\r\n", where is the number of
+  # seconds to sleep
+  # same as rackup/sleep_pid.ru
+  SLEEP_PID = -> (env) do
+    dly = (env['REQUEST_PATH'][/\/sleep(\d+)/,1] || '0').to_i
+    sleep dly
+    [200, {"Content-Type" => "text/plain"}, ["Slept #{dly} #{Process.pid}"]]
+  end
 end

test/rackup/sleep_pid.ru

@@ -0,0 +1,8 @@
+# call with "GET /sleep<d> HTTP/1.1\r\n\r\n", where <d> is the number of
+# seconds to sleep, returns process pid
+
+run lambda { |env|
+  dly = (env['REQUEST_PATH'][/\/sleep(\d+)/,1] || '0').to_i
+  sleep dly
+  [200, {"Content-Type" => "text/plain"}, ["Slept #{dly} #{Process.pid}"]]
+}