griffin 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcbf570b1ac6f1353cba627ce1b0aa0cd17372d13cb0e8c3f9bf39ade24823ff
-  data.tar.gz: c7be8298c69e26601a8cc22bab7d31d1a5a7c08581cb0d22c000e0b393eec292
+  metadata.gz: 61289d32bbb5830ad446ea08b51604a4f4cf0340f59ec596dcc92c32cf29f7ac
+  data.tar.gz: dc61c80a41aa8c79294d88c9b2042b3e7babb728c108be7fe7a581e6c6324559
 SHA512:
-  metadata.gz: 6e100c6375f4facf7bb50748f4d05aaa421fecd367b189378d4cf87adca6efb8cb1f91e03cae5e3dacb6703a285c0076f44a6e161cf23b1fca501ba084294814
-  data.tar.gz: 3730cf11b197b612d62d54b53d4180ae6c8532b29a6a575bf02592341ab833fefb60484c236fe788655ca7b2b19bfc0d3cfca9f78a2cfd7ee25a035fc5f8f2dd
+  metadata.gz: c0629cb8f5fe58daa29b9c44d0e27cf37f29885e26bbc8fefb4a9aac624be4efed3436e98053fd554bcff1576fa0c9c4e26c313baf1e059ededae9ab0237b601
+  data.tar.gz: ea6576f3ab391cc2f632872375926c26e1f374006ee1d7b9f38be37bbe8af053ebdc208f933db309e95a262e1fa14272efcbf17b45941d07be0998fb16cc6f18

data/griffin.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'grpc_kit', '>= 0.2.1'
+  spec.add_dependency 'grpc_kit', '>= 0.3.0'
   spec.add_dependency 'serverengine', '~> 2.0.7'
 end

data/lib/griffin/engine/server.rb

@@ -10,7 +10,11 @@ module Griffin
       def initialize
         @core = Griffin::Server.new(
           pool_size: config[:pool_size],
-          interceptors: config[:interceptors]
+          min_pool_size: config[:min_pool_size],
+          max_pool_size: config[:max_pool_size],
+          min_connection_size: config[:min_connection_size],
+          max_connection_size: config[:max_connection_size],
+          interceptors: config[:interceptors],
         )
       end
 

data/lib/griffin/engine/single.rb

@@ -8,7 +8,10 @@ module Griffin
     class Single
       def self.create(config)
         serv = Griffin::Server.new(
-          pool_size: config[:pool_size],
+          min_pool_size: config[:min_pool_size],
+          max_pool_size: config[:max_pool_size],
+          min_connection_size: config[:min_connection_size],
+          max_connection_size: config[:max_connection_size],
           interceptors: config[:interceptors],
         )
         new(serv, config)

data/lib/griffin/server.rb

@@ -35,11 +35,15 @@ module Griffin
       end
     end
 
-    # @param pool_size [Integer] Worker thread size
+    # @param min_pool_size [Integer] Worker thread mininum size
+    # @param max_pool_size [Integer] Worker thread maximun size
+    # @param min_connection_size [Integer] Maximun connection of TCP
+    # @param max_connection_size [Integer] Minimum connection of TCP
     # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>] list of interceptors
-    def initialize(pool_size:, interceptors: [], **opts)
-      @worker_size = pool_size
-      @server = GrpcKit::Server.new(interceptors: interceptors)
+    def initialize(min_pool_size:, max_pool_size:, min_connection_size:, max_connection_size:, interceptors: [], **opts)
+      @min_connection_size = min_connection_size
+      @max_connection_size = max_connection_size
+      @server = GrpcKit::Server.new(interceptors: interceptors, min_pool_size: min_pool_size, max_pool_size: max_pool_size)
       @opts = opts
       @status = :run
       @worker_id = 0
@@ -65,7 +69,7 @@ module Griffin
     def run(sock, blocking: true)
       @socks << sock
 
-      @thread_pool = Griffin::ThreadPool.new(@worker_size) do |conn|
+      @thread_pool = Griffin::ThreadPool.new(min: @min_connection_size, max: @max_connection_size) do |conn|
         @server.run(conn)
       end
 
@@ -113,11 +117,13 @@ module Griffin
         Griffin.logger.info("Shutting down sever(id=#{@worker_id}) forcibly...")
 
         @status = :halt
-        @server.graceful_shutdown
+        @server.force_shutdown
         true
       when GRACEFUL_SHUTDOWN
         Griffin.logger.info("Shutting down sever(id=#{@worker_id}) gracefully...")
+
         @status = :stop
+        @server.graceful_shutdown
         true
       end
     end

data/lib/griffin/server_config_builder.rb

@@ -7,12 +7,15 @@ module Griffin
     # Users can't change these values
     SERVERENGIEN_FIXED_CONFIGS = %i[daemonize worker_type worker_process_name].freeze
 
-    # The default size of thread pool
-    DEFAULT_POOL_SIZE = 10
+    # The default size of thread pool TCP Connection
+    DEFAULT_POOL_SIZE = 30
+    DEFAULT_CONNECTION_SIZE = 3
 
     GRIFFIN_CONFIGS = [
-      # The size of thread pool
-      :pool_size
+      :max_pool_size,
+      :min_pool_size,
+      :max_connection_size,
+      :min_connection_size,
     ].freeze
 
     GRPC_CONFIGS = %i[services interceptors].freeze
@@ -31,7 +34,10 @@ module Griffin
       workers: 1,
       bind: '0.0.0.0',
       port: 50051,
-      pool_size: DEFAULT_POOL_SIZE,
+      max_pool_size: DEFAULT_POOL_SIZE,
+      min_pool_size: DEFAULT_POOL_SIZE,
+      max_connection_size: DEFAULT_CONNECTION_SIZE,
+      min_connection_size: DEFAULT_CONNECTION_SIZE,
       interceptors: [],
       services: [],
     }.freeze
@@ -40,7 +46,7 @@ module Griffin
       @opts = DEFAULT_SERVER_CONFIG.dup
     end
 
-    (SERVERENGINE_PRIMITIVE_CONFIGS + GRIFFIN_CONFIGS).each do |name|
+    (SERVERENGINE_PRIMITIVE_CONFIGS).each do |name|
       define_method(name) do |value|
         @opts[name] = value
       end
@@ -52,6 +58,15 @@ module Griffin
       end
     end
 
+    def pool_size(min, max)
+      @opts[:min_pool_size] = Integer(min)
+      @opts[:max_pool_size] = Integer(max)
+    end
+
+    def connection_size(min, max)
+      @opts[:min_connection_size] = Integer(min)
+      @opts[:max_connection_size] = Integer(max)
+    end
     def interceptors(*value)
       @opts[:interceptors].concat(value).flatten!
     end

data/lib/griffin/thread_pool.rb

@@ -1,25 +1,27 @@
 # frozen_string_literal: true
 
-require 'griffin/counting_semaphore'
+require 'grpc_kit/thread_pool/auto_trimmer'
 
 module Griffin
   class ThreadPool
-    DEFAULT_POOL_SIZE = 20
-    DEFAULT_QUEUE_SIZE = 512
+    DEFAULT_MAX = 5
+    DEFAULT_MIN = 1
+    QUEUE_SIZE = 128
 
-    def initialize(pool_size = DEFAULT_POOL_SIZE, queue_size: DEFAULT_QUEUE_SIZE, &block)
-      @pool_size = pool_size
-      @queue_size = queue_size
+    def initialize(interval: 60, max: DEFAULT_MAX, min: DEFAULT_MIN, &block)
+      @max_pool_size = max
+      @min_pool_size = min
       @block = block
       @shutdown = false
-      @semaphore = Griffin::CountingSemaphore.new(queue_size)
-      @tasks = Queue.new
+      @tasks = SizedQueue.new(QUEUE_SIZE)
 
       @spawned = 0
       @workers = []
       @mutex = Mutex.new
+      @waiting = 0
 
-      @pool_size.times { spawn_thread }
+      @min_pool_size.times { spawn_thread }
+      @auto_trimmer = GrpcKit::ThreadPool::AutoTrimmer.new(self, interval: interval + rand(10)).tap(&:start!)
     end
 
     def schedule(task, &block)
@@ -32,25 +34,31 @@ module Griffin
       end
 
       # TODO: blocking now..
-      @semaphore.wait
       @tasks.push(block || task)
 
-      @mutex.synchronize do
-        if @spawned < @pool_size
-          spawn_thread
-        end
+      if @mutex.synchronize { (@waiting < @tasks.size) && (@spawned < @max_pool_size) }
+        spawn_thread
       end
     end
 
     def shutdown
       @shutdown = true
-      @pool_size.times { @tasks.push(nil) }
+      @max_pool_size.times { @tasks.push(nil) }
+      @auto_trimmer.stop
       until @workers.empty?
-        Griffin.logger.debug("#{@pool_size - @spawned} worker thread(s) shutdowned, waiting #{@spawned}")
+        Griffin.logger.debug("Shutdown waiting #{@waiting} workers")
         sleep 1
       end
     end
 
+    # For GrpcKit::ThreadPool::AutoTrimmer
+    def trim(force = false)
+      if @mutex.synchronize { (force || (@waiting > 0)) && (@spawned > @min_pool_size) }
+        GrpcKit.logger.info("Trim worker! Next worker size #{@spawned - 1}")
+        @tasks.push(nil)
+      end
+    end
+
     private
 
     def spawn_thread
@@ -64,7 +72,9 @@ module Griffin
             break
           end
 
+          @mutex.synchronize { @waiting += 1 }
           task = @tasks.pop
+          @mutex.synchronize { @waiting -= 1 }
           if task.nil?
             break
           end
@@ -73,8 +83,6 @@ module Griffin
             @block.call(task)
           rescue Exception => e # rubocop:disable Lint/RescueException
             Griffin.logger.error("An error occured on top level in worker #{Thread.current.name}: #{e.message} (#{e.class})\n #{Thread.current.backtrace.join("\n")}  ")
-          ensure
-            @semaphore.signal
           end
         end
 

data/lib/griffin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Griffin
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,6 @@ files:
 - examples/routeguide_server.rb
 - griffin.gemspec
 - lib/griffin.rb
-- lib/griffin/counting_semaphore.rb
 - lib/griffin/engine.rb
 - lib/griffin/engine/server.rb
 - lib/griffin/engine/single.rb

data/lib/griffin/counting_semaphore.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Griffin
-  class CountingSemaphore
-    def initialize(size)
-      @size = size
-      @queue = Queue.new
-      @size.times { @queue.push(0) }
-    end
-
-    def wait
-      @queue.pop
-    end
-
-    def signal
-      @queue.push(0)
-    end
-  end
-end