resque-cluster 0.1.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a6accecb72d6d1219eaa363bc58efd32cb89778d45d3e99354537c6f181600c3
-  data.tar.gz: 0298d96640d2232e0d0a73640a9e89670be80fab64189b50ad6afc4d84f52ef3
+SHA1:
+  metadata.gz: ff333888f274415257e79dbb38df4cea39f85aec
+  data.tar.gz: 2e4633a132a0b8ca17e96ac13e37446cb88c06e0
 SHA512:
-  metadata.gz: acef7b4118b0a66bfb41c373ee68302550dc28b57299c8587cd29ee4a897d0618e2b6e3364213e53eeb1c419e3a098dada0a760ac99aecec7b93bc56c69f29e6
-  data.tar.gz: 6085ee6845fba320b7b622913482af1062533bce58cc02fa87d0dc47edee47b331fe25d6cfafb1d273f9eebe1162524b2453f52e034e85a60afe6b13267c2594
+  metadata.gz: 60b4c0e0c44a770c927ae9395b63b28774ea5bc728f527ba9d612ae14f498671335cd7e288918c2898f0a01d33d83a266e72706bbc6145860f6b4c86c474b2c1
+  data.tar.gz: 6ba4a2699620059ffd384fffba71eabf3e44a1c2778636934787ea9f422b6b85d79f74d225938fa422ca67ef0ad666c63bff40764ef2933005a86082a0508ca2

data/Gemfile

@@ -1,9 +1,11 @@
 source 'http://rubygems.org'
 
 gem 'resque-pool', '~> 0.5.0'
-gem 'gru', '= 0.1.2'
+gem 'gru'
 
 group :development do
+  gem 'sys-proctable'
+  gem 'ffi'
   gem 'pry'
   gem 'awesome_print'
   gem 'rspec', '~> 3.1.0'

data/Gemfile.lock

@@ -1,32 +1,29 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    ast (2.0.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    awesome_print (1.6.1)
+    addressable (2.4.0)
+    ast (2.3.0)
+    awesome_print (1.7.0)
     builder (3.2.2)
-    coderay (1.1.0)
+    coderay (1.1.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.3)
-      addressable (~> 2.3)
+    ffi (1.9.14)
+    git (1.3.0)
+    github_api (0.14.5)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
-      oauth2
-    gru (0.1.2)
+      hashie (>= 3.4)
+      oauth2 (~> 1.0)
+    gru (0.1.3)
       redis (> 0.0)
-    hashie (3.4.2)
-    highline (1.7.2)
+    hashie (3.4.4)
+    highline (1.7.8)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -37,40 +34,42 @@ GEM
       rake
       rdoc
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.4)
     method_source (0.8.2)
-    mini_portile (0.6.2)
-    mock_redis (0.15.0)
+    mini_portile2 (2.1.0)
+    mock_redis (0.15.4)
     mono_logger (1.1.0)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
+      rack (>= 1.2, < 3)
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    pkg-config (1.1.7)
     powerpack (0.1.1)
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    rainbow (2.0.0)
-    rake (10.4.2)
+    rainbow (2.1.0)
+    rake (11.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.2.2)
+    redis (3.3.1)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
+    resque (1.26.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
@@ -92,26 +91,28 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
+    sys-proctable (1.1.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.5)
     trollop (2.1.2)
+    unicode-display_width (1.1.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -121,7 +122,8 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   bundler (~> 1.0)
-  gru (= 0.1.2)
+  ffi
+  gru
   jeweler (~> 2.0.1)
   mock_redis (~> 0.15.0)
   pry
@@ -130,6 +132,7 @@ DEPENDENCIES
   rspec (~> 3.1.0)
   rubocop (~> 0.31)
   simplecov
+  sys-proctable
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/resque/cluster.rb

@@ -1,4 +1,5 @@
 require 'resque/cluster/member'
+require 'resque/cluster/config'
 
 module Resque
   # Distributed Pool is a clustered resque-pool

data/lib/resque/cluster/config.rb

@@ -0,0 +1,169 @@
+require 'resque/cluster/config/file'
+require 'resque/cluster/config/verifier'
+
+module Resque
+  class Cluster
+    # Config is a global and local configuration of a member of a resque pool cluster
+    class Config
+      extend Forwardable
+
+      attr_reader :configs, :config, :global_config, :verifier, :version_git_hash
+
+      def initialize(config_path, global_config_path = nil)
+        @config = Config::File.new(config_path)
+
+        @configs = [config]
+
+        if global_config_path
+          global_config = Config::File.new(global_config_path)
+
+          if global_config.expand_path != config.expand_path
+            @global_config = global_config
+
+            @configs << global_config
+          end
+        end
+
+        @errors           = Set.new
+        @verifier         = Verifier.new(configs)
+        @version_git_hash = config_version
+      end
+
+      def verified?
+        verifier.verified? && complete_worker_config?
+      end
+
+      def gru_format
+        return {} unless verified?
+
+        {
+          manage_worker_heartbeats: true,
+          host_maximums:            host_maximums,
+          client_settings:          Resque.redis.client.options,
+          cluster_name:             Cluster.config[:cluster_name],
+          environment_name:         Cluster.config[:environment],
+          cluster_maximums:         cluster_maximums,
+          rebalance_flag:           rebalance_flag || false,
+          max_workers_per_host:     max_workers_per_host || nil,
+          presume_host_dead_after:  presume_dead_after || 120,
+          version_hash:             version_git_hash
+        }
+      end
+
+      def errors
+        @errors + configs.map { |config| config.errors.map { |error| "#{config}: #{error}" } }.flatten
+      end
+
+      def warnings
+        @warnings ||= []
+      end
+
+      def log_warnings
+        warnings.each do |warning|
+          puts warning
+        end
+      end
+
+      def log_errors
+        errors.each do |error|
+          puts error
+        end
+      end
+
+      private
+
+      def complete_worker_config?
+        host = host_maximums.delete_if { |_, v| v.nil? }
+        cluster = cluster_maximums.delete_if { |_, v| v.nil? }
+
+        (host.keys == cluster.keys).tap do |complete|
+          @errors << "Every worker configuration must contain a local and a global maximum." unless complete
+        end
+      end
+
+      def host_maximums
+        case config_type
+        when :separate
+          config.contents
+        when :old
+          config.contents.reject do |k, _|
+            ['global_maximums', 'presume_dead_after', 'max_workers_per_host', 'rebalance_cluster'].include?(k)
+          end
+        when :new
+          config['workers'].each.with_object({}) do |(pool, maximums), local_maximums|
+            local_maximums[pool] = maximums['local']
+          end
+        end
+      end
+
+      def cluster_maximums
+        case config_type
+        when :separate
+          global_config['global_maximums'] || global_config.contents.reject do |k, _|
+            ['global_maximums', 'presume_dead_after', 'max_workers_per_host', 'rebalance_cluster'].include?(k)
+          end
+        when :old
+          config['global_maximums']
+        when :new
+          config['workers'].each.with_object({}) do |(pool, maximums), global_maximums|
+            global_maximums[pool] = maximums['global']
+          end
+        end
+      end
+
+      def rebalance_flag
+        case config_type
+        when :separate
+          global_config['rebalance_cluster']
+        when :old, :new
+          config['rebalance_cluster']
+        end
+      end
+
+      def max_workers_per_host
+        case config_type
+        when :separate
+          global_config['max_workers_per_host']
+        when :old, :new
+          config['max_workers_per_host']
+        end
+      end
+
+      def presume_dead_after
+        case config_type
+        when :separate
+          global_config['presume_dead_after']
+        when :old, :new
+          config['presume_dead_after']
+        end
+      end
+
+      def config_type
+        @config_type ||=
+          if global_config
+            :separate
+          elsif config['workers']
+            :new
+          else
+            :old
+          end
+      end
+
+      def config_version
+        return unless verified?
+
+        directory_name = config.dirname
+
+        if directory_name.exist?
+          output = Dir.chdir(directory_name) { `git rev-parse --verify HEAD`.chomp }
+
+          if $?.success?
+            @version_git_hash = output
+          else
+            @warnings << "Your config directory: #{directory_name} is not a git repo. Your configuration will not be versioned"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resque/cluster/config/file.rb

@@ -0,0 +1,40 @@
+module Resque
+  class Cluster
+    class Config
+      class File < Pathname
+        extend Forwardable
+
+        delegate :[] => :contents
+
+        def exist?
+          super.tap { |exists| errors << "Configuration file doesn't exist" unless exists }
+        end
+
+        def valid?
+          if contents.is_a?(Hash)
+            errors << "Config file is empty" unless contents.any?
+          else
+            errors << "Parsed config as invalid type: expected Hash, got #{contents.class}"
+          end
+
+          contents.is_a?(Hash) && contents.any?
+        end
+
+        def errors
+          @errors ||= Set.new
+        end
+
+        def contents
+          @contents ||=
+            begin
+              YAML.load(ERB.new(self.read).result)
+            rescue => e
+              errors << e.message
+
+              nil
+            end
+        end
+      end
+    end
+  end
+end

data/lib/resque/cluster/config/verifier.rb

@@ -0,0 +1,27 @@
+module Resque
+  class Cluster
+    class Config
+      class Verifier
+        attr_reader :configs
+
+        def initialize(configs)
+          @configs = configs
+        end
+
+        def verified?
+          configs_exist? && configs_are_valid?
+        end
+
+        private
+
+        def configs_exist?
+          configs.all?(&:exist?)
+        end
+
+        def configs_are_valid?
+          configs.all?(&:valid?)
+        end
+      end
+    end
+  end
+end

data/lib/resque/cluster/member.rb

@@ -5,14 +5,18 @@ module Resque
   class Cluster
     # Member is a single member of a resque pool cluster
     class Member
-      attr_reader :hostname, :pool, :local_config, :global_config
+      attr_reader :hostname, :pool, :config
 
       def initialize(started_pool)
         @pool = started_pool
-        @local_config = parse_config(Cluster.config[:local_config_path])
-        @global_config = parse_config(Cluster.config[:global_config_path])
-        @global_config = @local_config if global_config.empty?
-        @worker_count_manager = initialize_gru
+        @config = Config.new(Cluster.config[:local_config_path], Cluster.config[:global_config_path])
+        if @config.verified?
+          @config.log_warnings
+          @worker_count_manager = initialize_gru
+        else
+          @config.log_errors
+          @pool.quit
+        end
       end
 
       def perform
@@ -25,6 +29,7 @@ module Resque
       end
 
       def check_for_worker_count_adjustment
+        return unless gru_is_inititalized?
         host_count_adjustment = @worker_count_manager.adjust_workers
         adjust_worker_counts(host_count_adjustment) if host_count_adjustment
       end
@@ -32,7 +37,7 @@ module Resque
       private
 
       def global_prefix
-        "cluster:#{Cluster.config[:cluster_name]}:#{Cluster.config[:environment]}"
+        "cluster:#{Cluster.config[:cluster_name]}:#{Cluster.config[:environment]}:#{@config.version_git_hash}"
       end
 
       def member_prefix
@@ -44,7 +49,7 @@ module Resque
       end
 
       def initialize_gru
-        Gru.create(cluster_member_settings)
+        Gru.create(@config.gru_format)
       end
 
       def hostname
@@ -53,29 +58,23 @@ module Resque
 
       def adjust_worker_counts(count_adjustments)
         count_adjustments.each do |worker, count|
-          next if count == 0
           @pool.adjust_worker_counts(worker, count)
           update_counts
         end
       end
 
-      def parse_config(config_path)
-        return {} unless config_path && File.exist?(config_path)
-        YAML.load(ERB.new(IO.read(config_path)).result)
-      end
-
       def remove_counts
         Resque.redis.del(running_workers_key_name)
       end
 
       def unqueue_all_workers
-        @worker_count_manager.release_workers
+        @worker_count_manager.release_workers if gru_is_inititalized?
       end
 
       def unqueue_workers(workers)
         workers = Array(workers)
         workers.each do |worker|
-          @worker_count_manager.release_workers(worker)
+          @worker_count_manager.release_workers(worker) if gru_is_inititalized?
         end
       end
 
@@ -86,19 +85,10 @@ module Resque
         end
       end
 
-      def cluster_member_settings
-        {
-          cluster_maximums:         @global_config["global_maximums"] || @global_config,
-          host_maximums:            @local_config,
-          client_settings:          Resque.redis.client.options,
-          rebalance_flag:           @global_config["rebalance_cluster"] || false,
-          max_workers_per_host:     @global_config["max_workers_per_host"] || nil,
-          cluster_name:             Cluster.config[:cluster_name],
-          environment_name:         Cluster.config[:environment],
-          presume_host_dead_after:  @global_config["presume_dead_after"] || 120,
-          manage_worker_heartbeats: true
-        }
+      def gru_is_inititalized?
+        ! @worker_count_manager.nil?
       end
+
     end
   end
 end