dryad 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82af7189f930847af3a2908429e7558eb32c7e73fa69a3e73789e369b1a607b1
-  data.tar.gz: de046cc3a8f9a68c5d8b355a8b38ca5d1da7da99590be43c63d13494f356a5c5
+  metadata.gz: 7d9594581141bcb13f995274f1c0595bfc9a8c484f3771c93ca670f5d2ccb307
+  data.tar.gz: 0daaea2d4d0ae211b295e95f00102454301c895472100b17bd7bfa75ed205139
 SHA512:
-  metadata.gz: d60c291c2f8e1d931677b1a4246cf8e8de562ac32c8856dec0a76c0987357bb28156d61e8adb84028dd57c4e5952f47c73194a1f3ce45f7bb1cb160dd304e1dd
-  data.tar.gz: 49b5d44240c4d489313948ac413143a335352a79b6719be3d9ee846c32bd1a5beb416a89984d45c6f93accd4de0a103b5886d6d7236089ca1d1e73170eb75c88
+  metadata.gz: a849308bd935c9baff26091a94285f4856196db8e376c64b16f57bfed4274dfbc82f5f2492574f5b545a08872e48ef60dbe1b3afc1a7dbeb4c93af9d5b773fb0
+  data.tar.gz: 70bf1b581b64e1924cb340620b8e93a556ea8d1a0465eb83f641bdc1cdf966241717260bfcc0ae6e37d39aedd80d7b4c30e543eb5b12d0ffb6f226586455f2e9

data/DRYAD_VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/Gemfile.lock

@@ -1,20 +1,22 @@
 PATH
   remote: .
   specs:
-    dryad (0.1.0)
-      dryad-cluster (= 0.1.0)
-      dryad-consul (= 0.1.0)
-      dryad-core (= 0.1.0)
-    dryad-cluster (0.1.0)
-      dryad-core (= 0.1.0)
-    dryad-consul (0.1.0)
-      diplomat
-      dryad-core (= 0.1.0)
-    dryad-core (0.1.0)
+    dryad (0.1.1)
+      dryad-cluster (= 0.1.1)
+      dryad-consul (= 0.1.1)
+      dryad-core (= 0.1.1)
+    dryad-cluster (0.1.1)
+      concurrent-ruby (~> 1.1, >= 1.1.5)
+      dryad-core (= 0.1.1)
+    dryad-consul (0.1.1)
+      diplomat (~> 2.2, >= 2.2.4)
+      dryad-core (= 0.1.1)
+    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)
@@ -22,7 +24,7 @@ GEM
       faraday (~> 0.9)
     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/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/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/dryad-cluster/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/dryad-cluster/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(".")

data/dryad-cluster/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/dryad-cluster/spec/dryad/cluster/round_robin_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe Dryad::Cluster::RoundRobin do
+  before do
+    @services = Array.new(10) {|index| index + 1}
+    @round_robin = Dryad::Cluster::RoundRobin.new
+  end
+
+  it "set services and get service correctly" do
+    @round_robin.set_services(@services)
+    10.times do |i|
+      expect(@round_robin.service).to eq(@services[(i + 1) % 10])
+    end
+  end
+
+  it "raises no services error when services are empty" do
+    begin
+      @round_robin.service
+    rescue StandardError => e
+      expect(e.class).to eq(Dryad::Cluster::NoServicesError)
+    end
+  end
+end

data/dryad-consul/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.1.0.alpha)
-      diplomat
-      dryad-core (= 0.1.0.alpha)
+    dryad-consul (0.1.1)
+      diplomat (~> 2.2, >= 2.2.4)
+      dryad-core (= 0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -13,10 +13,10 @@ GEM
     diplomat (2.2.4)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.1.0.alpha)
+    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-consul/dryad-consul.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dryad-core", Dryad::Consul::VERSION
-  spec.add_dependency "diplomat"
+  spec.add_dependency "diplomat", "~> 2.2", ">= 2.2.4"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/dryad-consul/lib/dryad/consul/service_registry.rb

@@ -15,19 +15,28 @@ module Dryad
         end
 
         def service_instances(name, schema, groups)
-          all_services = ServiceClient.get(Dryad::Core::Service.full_name(schema, name), :all)
-          services = []
+          all_services = ::Diplomat::Health.service(Dryad::Core::Service.full_name(schema, name))
+          service_instances = []
           all_services.each do |service|
-            groups.each do |group|
-              services << service if service.ServiceTags.include?("group = \"#{group}\"")
+            service_hash = service.Service
+            if !service_hash["Meta"].nil? && service_hash["Meta"].has_key?("group") &&
+              groups.include?(service_hash["Meta"]["group"])
+              service_instances << service_hash
+            else
+              groups.each do |group|
+                if service_hash["Tags"].include?("group = \"#{group}\"")
+                  service_instances << service_hash
+                  break
+                end
+              end
             end
           end
-          services.map do |service|
+          service_instances.map do |service|
             Dryad::Core::ServiceInstance.new(
               name: name,
               schema: schema,
-              address: service.ServiceAddress,
-              port: service.ServicePort
+              address: service["Address"],
+              port: service["Port"]
             )
           end
         end

data/dryad-consul/lib/dryad/consul/version.rb

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

data/dryad-core/lib/dryad/core/version.rb

@@ -2,7 +2,7 @@ module Dryad
   module Core
     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
 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,42 +16,42 @@ 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: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     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: dryad-cluster
   requirement: !ruby/object:Gem::Requirement
     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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,9 @@ files:
 - dryad-cluster/bin/setup
 - dryad-cluster/dryad-cluster.gemspec
 - dryad-cluster/lib/dryad/cluster.rb
+- dryad-cluster/lib/dryad/cluster/round_robin.rb
 - dryad-cluster/lib/dryad/cluster/version.rb
+- dryad-cluster/spec/dryad/cluster/round_robin_spec.rb
 - dryad-cluster/spec/dryad/cluster_spec.rb
 - dryad-cluster/spec/dummy/config/dryad.yml
 - dryad-cluster/spec/spec_helper.rb