dryad-cluster 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c423ba271b85dbd2cf4db26a3d8e813d68ec939f082033716cb34761a1fc08b6
-  data.tar.gz: 964a0b0bca07e4aeff2379ad26947b9fa03f0cce38fe78c26427aff83c680f99
+  metadata.gz: c4e41d97f7f444f717e1eb18d83be6d91ad8bc2193614e30f3a89ae32db76ac5
+  data.tar.gz: 4414921185b93261f6fd4480b20269db784e2be38630bce346d291ff2c9ee579
 SHA512:
-  metadata.gz: 17cb32d2c7ba3be2246d0c8b58178a17dfd468b466b603b7e17a03b25c254248305e6ee391b9d8b31fae3d8f71ceb12d5750ac0aaf91aead823df86889d0dc5c
-  data.tar.gz: 1dd316d980efef495ae92867ee1ad1d0c71dfb490cc9582ed957a301ec90aafa2ecb1d76e035be44757d2be7b87237da1a65544c1fb4039aa5ca80e4eb5d51e7
+  metadata.gz: 82491e5a318d0a607119a0ff486d9a054309f6167e90e39da2592e453277e25eeb7a10df706bfbfe9576aa4159206f687dcdd99fdbb96e614bf5d71828df5b99
+  data.tar.gz: 9d318d37a0f10da3787301ab060f7c4863a2f3bdc3f0d998662d7bc75326be438be882b9870154e766acc8d52572d4317bf46c2c49796d85f8397137818a5431

data/Gemfile.lock

@@ -1,24 +1,26 @@
 PATH
   remote: .
   specs:
-    dryad-cluster (0.1.0.alpha)
-      dryad-core (= 0.1.0.alpha)
+    dryad-cluster (0.1.1)
+      concurrent-ruby (~> 1.1, >= 1.1.5)
+      dryad-core (= 0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     diplomat (2.2.4)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-consul (0.1.0.alpha)
-      diplomat
-      dryad-core (= 0.1.0.alpha)
-    dryad-core (0.1.0.alpha)
+    dryad-consul (0.1.1)
+      diplomat (~> 2.2, >= 2.2.4)
+      dryad-core (= 0.1.1)
+    dryad-core (0.1.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    multipart-post (2.1.0)
+    multipart-post (2.1.1)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/dryad-cluster.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dryad-core", Dryad::Cluster::VERSION
+  spec.add_dependency "concurrent-ruby", "~> 1.1", ">= 1.1.5"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dryad/cluster.rb

@@ -1,16 +1,36 @@
+require 'concurrent'
 require "dryad"
 require "dryad/cluster/version"
+require "dryad/cluster/round_robin"
 
 module Dryad
   module Cluster
     class Error < StandardError; end
+    class NoServicesError < Error; end
 
     class << self
       REGISTRY = Object.const_get(Dryad.configuration.registry)
+      CLUSTERS = {}
 
       def round_robin(schema, service_name)
         groups = ['_global_', Dryad.configuration.group]
-        REGISTRY.service_instances(service_name, schema, groups).first
+        full_name = Dryad::Core::Service.full_name(schema, service_name)
+        if CLUSTERS[full_name].nil?
+          CLUSTERS[full_name] = Dryad::Cluster::RoundRobin.new
+          CLUSTERS[full_name].set_services(sorted_instances(service_name, schema, groups))
+        end
+        begin
+          retries ||= 0
+          CLUSTERS[full_name].service
+        rescue Dryad::Cluster::NoServicesError
+          CLUSTERS[full_name].set_services(sorted_instances(service_name, schema, groups))
+          retry if (retries += 1) < 2
+        end
+      end
+
+      def sorted_instances(service_name, schema, groups)
+        sis = REGISTRY.service_instances(service_name, schema, groups)
+        sis.sort {|a, b| "#{a.address}:#{a.port}" <=> "#{b.address}:#{b.port}"}
       end
     end
   end

data/lib/dryad/cluster/round_robin.rb

@@ -0,0 +1,22 @@
+module Dryad
+  module Cluster
+    class RoundRobin
+      def initialize
+        @index = Concurrent::AtomicFixnum.new
+        @services = Concurrent::AtomicReference.new
+      end
+
+      def set_services(instances)
+        @services.set(instances)
+      end
+
+      def service
+        instances = @services.get()
+        if instances.nil? || instances.empty?
+          raise Dryad::Cluster::NoServicesError, "Round robin nodes are empty."
+        end
+        instances[@index.increment % instances.size]
+      end
+    end
+  end
+end

data/lib/dryad/cluster/version.rb

@@ -2,7 +2,7 @@ module Dryad
   module Cluster
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
   
     VERSION = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-cluster
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dryad-core
@@ -16,14 +16,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +104,7 @@ files:
 - bin/setup
 - dryad-cluster.gemspec
 - lib/dryad/cluster.rb
+- lib/dryad/cluster/round_robin.rb
 - lib/dryad/cluster/version.rb
 homepage: https://github.com/jack0pan/dryad.rb
 licenses: