gru 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3568199a19c30ad45c3e4888884901d19ebf8c2c
-  data.tar.gz: 987f4860c98601be7dca13be6dcd4ec590f84881
+  metadata.gz: 89ae1e251f9db9637786d27b5abeb7de7fd0bef7
+  data.tar.gz: 0dbd72c564a5622ec09abd483d408c7c851e072b
 SHA512:
-  metadata.gz: 386d66bc3221a042fc314ff088dfec031a68def5245873dfb3ba99af9a8567a49096ac9e6f8d97ef038ea077ee8ac429c5e62b09803afb2a9d270b5436940238
-  data.tar.gz: a2ffe6817185cd9c44fd3aaa0968b17bf49a6e27ba004dcaca2007d5998f4f8a6aeffe9e3fa03b73f601ba7d60f6be2e8f7a773a9783a236d36778342e2fe038
+  metadata.gz: b3740b2ee29bc4f65968eedd061d5f6fb506a24152088329e7297ecc519b67f8f1f044b03fe515a185987a09691b7b0bf564a9fa0cc2801adca8072df8fd2796
+  data.tar.gz: f360078d5e374287902e5ce48d78cd6015dd7a83bf986b993ad5a771f2dda556cc64335848f48f81e2dbfe800b3f15f2af04255b013b5e9ff5efc30e4774384c

data/lib/gru/adapters/redis_adapter.rb

@@ -190,7 +190,8 @@ module Gru
         host_running,global_running,host_max,global_max = worker_counts(worker)
         result = false
         if rebalance_cluster?
-          result = host_running.to_i < max_workers_per_host(global_max,host_max)
+          result = host_running.to_i < max_workers_per_host(global_max,host_max) &&
+            host_running.to_i < @settings.max_worker_processes_per_host
         else
           result = host_running.to_i < host_max.to_i
         end
@@ -201,7 +202,8 @@ module Gru
         host_running,global_running,host_max,global_max = worker_counts(worker)
         result = false
         if rebalance_cluster?
-          result = host_running.to_i > max_workers_per_host(global_max,host_max)
+          result = host_running.to_i > max_workers_per_host(global_max,host_max) ||
+            host_running.to_i > @settings.max_worker_processes_per_host
         else
           result = host_running.to_i > host_max.to_i
         end

data/lib/gru/configuration.rb

@@ -3,7 +3,8 @@ require 'gru/adapters/redis_adapter'
 
 module Gru
   class Configuration
-    attr_reader :cluster_maximums, :host_maximums, :rebalance_flag, :adapter, :cluster_name, :environment_name, :presume_host_dead_after, :client_settings, :manage_worker_heartbeats
+    attr_reader :cluster_maximums, :host_maximums, :rebalance_flag, :adapter, :cluster_name,
+      :environment_name, :presume_host_dead_after, :client_settings, :manage_worker_heartbeats, :max_worker_processes_per_host
     def initialize(settings)
       @host_maximums = settings.delete(:host_maximums) || settings.delete(:cluster_maximums)
       @cluster_maximums = settings.delete(:cluster_maximums) || @host_maximums
@@ -13,6 +14,7 @@ module Gru
       @presume_host_dead_after = settings.delete(:presume_host_dead_after)
       @client_settings = settings.delete(:client_settings)
       @manage_worker_heartbeats = settings.delete(:manage_worker_heartbeats) || false
+      @max_worker_processes_per_host = settings.delete(:max_workers_per_host) || 30
       @adapter = Gru::Adapters::RedisAdapter.new(self)
       if @cluster_maximums.nil?
         raise ArgumentError, "Need at least a cluster configuration"

data/lib/gru/version.rb

@@ -1,3 +1,3 @@
 module Gru
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/gru/adapters/redis_adapter_spec.rb

@@ -152,7 +152,6 @@ describe Gru::Adapters::RedisAdapter do
         available_workers = adapter.provision_workers
         expect(available_workers).to eq({'test_worker' => 0})
       end
-
     end
   end
 
@@ -207,8 +206,9 @@ describe Gru::Adapters::RedisAdapter do
       Gru::Configuration.new({
         cluster_maximums: { 'test_worker' => 3 },
         environment_name: 'environment',
-        cluster_name: 'cluster',
-        rebalance_flag: true
+        max_workers_per_host: 10,
+        rebalance_flag: true,
+        cluster_name: 'cluster'
       })
     }
 
@@ -228,6 +228,36 @@ describe Gru::Adapters::RedisAdapter do
       adapter.provision_workers
     end
 
+    it "doesn't provision workers if local proc max has been reached" do
+      expect(client).to receive(:multi).exactly(3).times.and_yield(client).and_return([10,20,20,30])
+      expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:max_workers").and_return(config.cluster_maximums)
+      expect(client).to receive(:keys).with("#{gru_key}:*:workers_running").exactly(3).times.and_return(["test1","test2"])
+      expect(client).to receive(:get).with("#{gru_key}:rebalance").exactly(3).times.and_return("true")
+      expect(client).to receive(:hget).with("#{gru_key}:#{hostname}:max_workers",'test_worker').exactly(3).times
+      expect(client).to receive(:hget).with("#{gru_key}:global:max_workers",'test_worker').exactly(3).times
+      expect(client).to receive(:hget).with("#{gru_key}:#{hostname}:workers_running",'test_worker').exactly(3).times
+      expect(client).to receive(:hget).with("#{gru_key}:global:workers_running",'test_worker').exactly(3).times
+      available_workers = adapter.provision_workers
+      expect(available_workers).to eq({'test_worker' => 0})
+    end
+
+    it "provisions workers if local proc max hasn't been reached" do
+      expect(client).to receive(:multi).exactly(3).times.and_yield(client).and_return([9,20,20,30], [10,20,20,30])
+      expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:max_workers").and_return(config.cluster_maximums)
+      expect(client).to receive(:setnx).exactly(1).times.and_return(true)
+      expect(client).to receive(:hincrby).with("#{gru_key}:foo:workers_running",'test_worker',1).exactly(1).times
+      expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',1).exactly(1).times
+      expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(1).times
+      expect(client).to receive(:keys).with("#{gru_key}:*:workers_running").exactly(3).times.and_return(["test1","test2"])
+      expect(client).to receive(:get).with("#{gru_key}:rebalance").exactly(3).times.and_return("true")
+      expect(client).to receive(:hget).with("#{gru_key}:#{hostname}:max_workers",'test_worker').exactly(3).times
+      expect(client).to receive(:hget).with("#{gru_key}:global:max_workers",'test_worker').exactly(3).times
+      expect(client).to receive(:hget).with("#{gru_key}:#{hostname}:workers_running",'test_worker').exactly(3).times
+      expect(client).to receive(:hget).with("#{gru_key}:global:workers_running",'test_worker').exactly(3).times
+      available_workers = adapter.provision_workers
+      expect(available_workers).to eq({'test_worker' => 1})
+    end
+
     it "increases load when workers are removed" do
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gru
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeffrey Gillis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis