grpclb 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b85ba65cf8d185b28e8b75ff30dc889201ed2ab
-  data.tar.gz: 7d338e7ae2e0856698dfe9f07c9745fa2abb6beb
+SHA256:
+  metadata.gz: 4e80ab9eb796b8eaad091f9ce0627fa84642f465c162b24ce5db3b18477c593c
+  data.tar.gz: d565b8ae18766ca1eecf13e96643fed70eb1ebf087c0717027c8535d4b43e1ae
 SHA512:
-  metadata.gz: e77a00a74ccc9bfc06c7958559a77808dcad2c6798dfc4b6754a4d3d051dec8034681402136be4d38dea0a47a6d36ae575b3d78322b5a9b3d200a83c81258aee
-  data.tar.gz: 185c097ed9def4b65b05a332f39607a14e45b73c1ac8351d9efdc7d2e4335e3853e18a1e1553211877d89cc9a992a699a11d7e91211e3634629934713f8a10c2
+  metadata.gz: b48b989997b1bebb1ed1048db41ad31658b17b7fff7bde04f1f96c2438e29c5dfa22a2381ae079d6b52a13146df21d631aac385371bb77e72fcdc99f639119ec
+  data.tar.gz: cb9ff1d94ae9ea598c1e710486a91b5fd66a0658f8f85a0f7e2ab9ab824b1adde6d1febbd2db48f990652df93de55947d502dbd81e8605d473d6b5f662a4cb31

data/ruby/.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2

data/ruby/README.md

@@ -0,0 +1,41 @@
+# grpclb/ruby
+
+Ruby implementation of grpclb client and server.
+
+
+
+## Client
+
+```ruby
+require 'grpclb/client' # or just 'grpclb'
+
+# construct client:
+client = Grpclb::Client.new('127.0.0.1:8383', 'service-name', HelloWorld::V1::Stub)
+
+# call methods:
+client.say_hello(HelloWorld::HelloRequest.new(...))
+```
+
+Creates and maintains a load-balanced connection for given service stub.
+
+Automatically reconnects on UNAVAILABLE errors.
+
+
+
+## Server
+
+```ruby
+require 'grpclb/server' # or just 'grpclb'
+
+# construct server:
+server = Grpclb::Server.new(...) # just a subclass of GRPC::RpcServer, same initialize args
+
+# handle services:
+server.handle(HelloWorld::V1::ServiceImpl) # or .handle(HelloWorld::V1::ServiceImpl.new)
+
+# set up and run:
+server.add_http2_port '127.0.0.1:8080', :this_port_is_insecure
+server.run_till_terminated
+```
+
+Subclass of `GRPC::RpcServer`, that takes care of grpclb load reporting.

data/ruby/lib/grpclb.rb

@@ -1,31 +1,2 @@
-require 'grpclb_backend_v1/backend_pb'
-require 'grpclb_backend_v1/backend_services_pb'
-require 'grpclb_balancer_v1/balancer_pb'
-require 'grpclb_balancer_v1/balancer_services_pb'
-
-class Grpclb::Client < ::SimpleDelegator
-  attr_reader :target
-
-  # @param [String] lb_addr the load balancer address
-  # @param [String] target the target service name, as registered in the backend
-  # @param [Class] service_stub the service stub class
-  def initialize(lb_addr, target, service_stub, lb_creds: :this_channel_is_insecure, service_creds: :this_channel_is_insecure)
-    @lb_stub = Grpclb::Balancer::V1::LoadBalancer::Stub.new(lb_addr, lb_creds)
-    @target  = target
-    @service_stub  = service_stub
-    @service_creds = service_creds
-
-    reconnect!
-  end
-
-  def reconnect!
-    req     = Grpclb::Balancer::V1::ServersRequest.new(target: target)
-    servers = @lb_stub.servers(req).servers
-    raise "No servers available for target '#{target}'" if servers.empty?
-
-    primary = servers.first.address
-    client  = @service_stub.new(primary, @service_creds)
-    __setobj__(client)
-  end
-
-end
+require 'grpclb/client'
+require 'grpclb/server'

data/ruby/lib/grpclb/client.rb

@@ -0,0 +1,54 @@
+require 'grpclb_balancer_v1/balancer_pb'
+require 'grpclb_balancer_v1/balancer_services_pb'
+
+class Grpclb::Client
+  attr_reader :target
+
+  DEFAULT_MAX_RECONNECTS = 3
+
+  # @param [String] lb_addr the load balancer address
+  # @param [String] target the target service name, as registered in the backend
+  # @param [Class] service_stub the service stub class
+  def initialize(lb_addr, target, service_stub, lb_creds: :this_channel_is_insecure, service_creds: :this_channel_is_insecure, max_reconnects: DEFAULT_MAX_RECONNECTS) # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
+    @lb_stub = Grpclb::Balancer::V1::LoadBalancer::Stub.new(lb_addr, lb_creds)
+    @target = target
+    @service_stub  = service_stub
+    @service_creds = service_creds
+    @max_reconnects = max_reconnects
+
+    service_stub.parent.const_get(:Service).rpc_descs.each_key do |meth|
+      meth = GRPC::GenericService.underscore(meth.to_s).to_sym
+
+      define_singleton_method meth do |*a, &b|
+        with_reconnect { client.send(meth, *a, &b) }
+      end
+    end
+
+    reconnect!
+  end
+
+  def reconnect!
+    req     = Grpclb::Balancer::V1::ServersRequest.new(target: target)
+    servers = @lb_stub.servers(req).servers
+    raise "No servers available for target '#{target}'" if servers.empty?
+
+    primary = servers.first.address
+    @client = @service_stub.new(primary, @service_creds)
+  end
+
+  private
+
+  def with_reconnect
+    retries = 0
+    begin
+      yield
+    rescue GRPC::BadStatus => e
+      raise unless e.code == GRPC::Core::StatusCodes::UNAVAILABLE
+      raise if retries >= @max_reconnects
+
+      reconnect!
+      retries += 1
+      retry
+    end
+  end
+end

data/ruby/lib/grpclb/internal/load_report_service.rb

@@ -0,0 +1,18 @@
+require 'grpclb_backend_v1/backend_pb'
+require 'grpclb_backend_v1/backend_services_pb'
+
+module Grpclb
+  module Internal
+    class LoadReportService < Grpclb::Backend::V1::LoadReport::Service
+      include GRPC::GenericService
+
+      def initialize(pool)
+        @pool = pool
+      end
+
+      def load(_req, _call)
+        Backend::V1::LoadResponse.new(score: @pool.jobs_waiting)
+      end
+    end
+  end
+end

data/ruby/lib/grpclb/server.rb

@@ -0,0 +1,10 @@
+require 'grpclb/internal/load_report_service'
+
+class Grpclb::Server < GRPC::RpcServer
+  DUMMY_POOL = Struct.new(:jobs_waiting).new(0)
+
+  def initialize(*args)
+    super
+    handle(Grpclb::Internal::LoadReportService.new(@pool || DUMMY_POOL))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpclb
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -52,13 +52,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ruby/.editorconfig
+- ruby/README.md
 - ruby/lib/grpclb.rb
+- ruby/lib/grpclb/client.rb
+- ruby/lib/grpclb/internal/load_report_service.rb
+- ruby/lib/grpclb/server.rb
 - ruby/lib/grpclb_backend_v1/backend_pb.rb
 - ruby/lib/grpclb_backend_v1/backend_services_pb.rb
 - ruby/lib/grpclb_balancer_v1/balancer_pb.rb
@@ -82,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: grpclb ruby protocol