unicorn_wrangler 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f979de2b4204b8d70b777ef12a6c750df185d10c
-  data.tar.gz: f036a306736461c42f300b7379a4abd16dc7706d
+SHA256:
+  metadata.gz: cfcaf29cd13aac1fef51db90f04d6e531f8d7c8c3b944e02449c35dae44d8211
+  data.tar.gz: edc4413e67dad70cd6f18589499b06ac1bff9a6830a6494e3139a2ff6cb2cb18
 SHA512:
-  metadata.gz: 8b054911dbcac21a4aa5b35fca0d3aaf7772af86faa04036250755161cba1f73392aa947fed586b1686a9a27a61c55fc97181e8ff90f80c27109638f0dc85c59
-  data.tar.gz: c153c524c4e35210e28a4dd4ac57ec1fc80acb6a92a3ef75ebe5cd638d58888022b2b969e35bda0aba28f86a3bbaab7d93f2fce9a6d03f40dcc3de0055b94851
+  metadata.gz: 9a5b367df477b3ce85ab39d08cb07de5e21c207bc17b0a459e3e0e2f1124b8e83b03baac0ca9316680c1330ec989a05d2e727380bbe6a3bfb3ac9d2ae5fde633
+  data.tar.gz: 5f6675d7e9e086bb25bd1604949ad24326fc1e8a2f88c01e2f50cd570a3314e23edb73322cabd6cb696cf88e50e389a0ff9c82e44dbed2d8a04abdef0a012713

data/lib/unicorn_wrangler.rb

@@ -3,6 +3,7 @@
 # - runs GC out of band (does not block requests)
 
 require 'benchmark'
+require 'unicorn_wrangler/rss_reader'
 
 module UnicornWrangler
   STATS_NAMESPACE = 'unicorn'
@@ -109,6 +110,7 @@ module UnicornWrangler
     def initialize(logger, stats)
       @logger = logger
       @stats = stats
+      @rss_reader = RssReader.new(logger: logger)
     end
 
     private
@@ -130,9 +132,9 @@ module UnicornWrangler
       UnicornWrangler.kill_worker
     end
 
-    # expensive, do not run on every request
+    # RSS memory in MB. Can be expensive, do not run on every request
     def used_memory
-      `ps -o rss= -p #{Process.pid}`.to_i / 1024
+      @rss_reader.rss
     end
 
     def report_status(status, reason, memory, requests, request_time, log_level = :debug)

data/lib/unicorn_wrangler/rss_reader.rb

@@ -0,0 +1,50 @@
+# Read RSS based on the OS we are in. When in linux, we can read the proc status file and parse out
+# the RSS which is much faster than forking+execing ps.
+module UnicornWrangler
+  class RssReader
+    LINUX = RbConfig::CONFIG['host_os'].start_with?('linux')
+    PS_CMD = 'ps -o rss= -p %d'.freeze
+    VM_RSS = /^VmRSS:\s+(\d+)\s+(\w+)/
+    UNITS  = {
+      b:  1024**0,
+      kb: 1024**1,
+      mb: 1024**2,
+      gb: 1024**3,
+      tb: 1024**4,
+    }.freeze
+
+    def initialize(logger:)
+      @logger = logger
+    end
+
+    # Returns RSS in megabytes; should work on Linux and Mac OS X
+    def rss(pid: Process.pid)
+      LINUX ? rss_linux(pid) : rss_posix(pid)
+    end
+
+    private
+
+    # Fork/exec ps and parse result.
+    # Should work on any system with POSIX ps.
+    # ~4ms
+    # returns kb but we want mb
+    def rss_posix(pid)
+      `#{PS_CMD % [pid]}`.to_i / 1024
+    end
+
+    # Read from /proc/$pid/status.  Linux only.
+    # ~100x faster and doesn't incur significant memory cost.
+    # file returns variable units, we want mb
+    def rss_linux(pid)
+      File.read("/proc/#{pid}/status").match(VM_RSS) do |match|
+        value, magnitude = match[1].to_i, UNITS.fetch(match[2].downcase.to_sym)
+
+        value * magnitude / UNITS.fetch(:mb)
+      end
+    rescue
+      # If the given pid is dead, file will not be found
+      @logger.warn 'Failed to read RSS from /proc, falling back to exec+ps' if @logger
+      rss_posix(pid)
+    end
+  end
+end

data/lib/unicorn_wrangler/version.rb

@@ -1,3 +1,3 @@
 module UnicornWrangler
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn_wrangler
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - lib/unicorn_wrangler.rb
+- lib/unicorn_wrangler/rss_reader.rb
 - lib/unicorn_wrangler/version.rb
 homepage: https://github.com/grosser/unicorn_wrangler
 licenses:
@@ -31,15 +32,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Unicorn: out of band GC / restart on max memory bloat / restart after X