grpc-flamingo 1.11.0 → 1.15.0

data/src/ruby/lib/grpc/generic/active_call.rb

@@ -116,10 +116,11 @@ module GRPC
 
     # Sends the initial metadata that has yet to be sent.
     # Does nothing if metadata has already been sent for this call.
-    def send_initial_metadata
+    def send_initial_metadata(new_metadata = {})
       @send_initial_md_mutex.synchronize do
         return if @metadata_sent
-        @metadata_tag = ActiveCall.client_invoke(@call, @metadata_to_send)
+        @metadata_to_send.merge!(new_metadata)
+        ActiveCall.client_invoke(@call, @metadata_to_send)
         @metadata_sent = true
       end
     end
@@ -321,18 +322,22 @@ module GRPC
     # @return [Enumerator] if no block was given
     def each_remote_read_then_finish
       return enum_for(:each_remote_read_then_finish) unless block_given?
-      begin
-        loop do
-          resp = remote_read
-          if resp.nil?  # the last response was received
-            receive_and_check_status
-            break
+      loop do
+        resp =
+          begin
+            remote_read
+          rescue GRPC::Core::CallError => e
+            GRPC.logger.warn("In each_remote_read_then_finish: #{e}")
+            nil
           end
-          yield resp
-        end
-      ensure
-        set_input_stream_done
+
+        break if resp.nil?  # the last response was received
+        yield resp
       end
+
+      receive_and_check_status
+    ensure
+      set_input_stream_done
     end
 
     # request_response sends a request to a GRPC server, and returns the
@@ -388,7 +393,7 @@ module GRPC
     def client_streamer(requests, metadata: {})
       raise_error_if_already_executed
       begin
-        merge_metadata_and_send_if_not_already_sent(metadata)
+        send_initial_metadata(metadata)
         requests.each { |r| @call.run_batch(SEND_MESSAGE => @marshal.call(r)) }
       rescue GRPC::Core::CallError => e
         receive_and_check_status # check for Cancelled
@@ -490,7 +495,7 @@ module GRPC
       raise_error_if_already_executed
       # Metadata might have already been sent if this is an operation view
       begin
-        merge_metadata_and_send_if_not_already_sent(metadata)
+        send_initial_metadata(metadata)
       rescue GRPC::Core::CallError => e
         batch_result = @call.run_batch(RECV_STATUS_ON_CLIENT => nil)
         set_input_stream_done
@@ -571,15 +576,6 @@ module GRPC
       end
     end
 
-    def merge_metadata_and_send_if_not_already_sent(new_metadata = {})
-      @send_initial_md_mutex.synchronize do
-        return if @metadata_sent
-        @metadata_to_send.merge!(new_metadata)
-        @call.run_batch(SEND_INITIAL_METADATA => @metadata_to_send)
-        @metadata_sent = true
-      end
-    end
-
     def attach_peer_cert(peer_cert)
       @peer_cert = peer_cert
     end

data/src/ruby/lib/grpc/generic/rpc_server.rb

@@ -364,7 +364,8 @@ module GRPC
       # sent yet
       c = ActiveCall.new(an_rpc.call, noop, noop, an_rpc.deadline,
                          metadata_received: true, started: false)
-      c.send_status(GRPC::Core::StatusCodes::RESOURCE_EXHAUSTED, '')
+      c.send_status(GRPC::Core::StatusCodes::RESOURCE_EXHAUSTED,
+                    'No free threads in thread pool')
       nil
     end
 

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.11.0'
+  VERSION = '1.15.0'
 end

data/src/ruby/pb/generate_proto_ruby.sh

@@ -32,7 +32,13 @@ $PROTOC -I . \
     --plugin=$PLUGIN
 
 $PROTOC -I . \
-    src/proto/grpc/testing/{messages,payloads,stats,services,control}.proto \
+    src/proto/grpc/core/stats.proto \
+    --grpc_out=src/ruby/qps \
+    --ruby_out=src/ruby/qps \
+    --plugin=$PLUGIN
+
+$PROTOC -I . \
+    src/proto/grpc/testing/{messages,payloads,stats,benchmark_service,report_qps_scenario_service,worker_service,control}.proto \
     --grpc_out=src/ruby/qps \
     --ruby_out=src/ruby/qps \
     --plugin=$PLUGIN

data/src/ruby/pb/grpc/health/v1/health_services_pb.rb

@@ -1,7 +1,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # Source: grpc/health/v1/health.proto for package 'grpc.health.v1'
 # Original file comments:
-# Copyright 2015 gRPC authors.
+# Copyright 2015 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# The canonical version of this proto can be found at
+# https://github.com/grpc/grpc-proto/blob/master/grpc/health/v1/health.proto
+#
 
 require 'grpc'
 require 'grpc/health/v1/health_pb'

data/src/ruby/spec/call_credentials_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 describe GRPC::Core::CallCredentials do
   CallCredentials = GRPC::Core::CallCredentials

data/src/ruby/spec/call_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 include GRPC::Core::StatusCodes
 

data/src/ruby/spec/channel_credentials_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 describe GRPC::Core::ChannelCredentials do
   ChannelCredentials = GRPC::Core::ChannelCredentials

data/src/ruby/spec/channel_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 def load_test_certs
   test_root = File.join(File.dirname(__FILE__), 'testdata')

data/src/ruby/spec/client_auth_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 def create_channel_creds
   test_root = File.join(File.dirname(__FILE__), 'testdata')
@@ -39,17 +39,6 @@ def create_server_creds
     true) # force client auth
 end
 
-# A test message
-class EchoMsg
-  def self.marshal(_o)
-    ''
-  end
-
-  def self.unmarshal(_o)
-    EchoMsg.new
-  end
-end
-
 # a test service that checks the cert of its peer
 class SslTestService
   include GRPC::GenericService

data/src/ruby/spec/client_server_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 include GRPC::Core
 

data/src/ruby/spec/compression_options_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 describe GRPC::Core::CompressionOptions do
   # Note these constants should be updated

data/src/ruby/spec/error_sanity_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 StatusCodes = GRPC::Core::StatusCodes
 

data/src/ruby/spec/generic/client_stub_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 Thread.abort_on_exception = true
 
@@ -265,14 +265,14 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
         end
         creds = GRPC::Core::CallCredentials.new(failing_auth)
 
-        unavailable_error_occured = false
+        unavailable_error_occurred = false
         begin
           get_response(stub, credentials: creds)
         rescue GRPC::Unavailable => e
-          unavailable_error_occured = true
+          unavailable_error_occurred = true
           expect(e.details.include?(error_message)).to be true
         end
-        expect(unavailable_error_occured).to eq(true)
+        expect(unavailable_error_occurred).to eq(true)
 
         @server.shutdown_and_notify(Time.now + 3)
         th.join
@@ -589,6 +589,18 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
           responses.each { |r| p r }
         end
       end
+
+      it 'raises GRPC::Cancelled after the call has been cancelled' do
+        server_port = create_test_server
+        host = "localhost:#{server_port}"
+        th = run_server_streamer(@sent_msg, @replys, @pass)
+        stub = GRPC::ClientStub.new(host, :this_channel_is_insecure)
+        resp = get_responses(stub, run_start_call_first: false)
+        expect(resp.next).to eq('reply_1')
+        @op.cancel
+        expect { resp.next }.to raise_error(GRPC::Cancelled)
+        th.join
+      end
     end
   end
 

data/src/ruby/spec/generic/rpc_desc_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 require 'grpc/generic/rpc_desc'
 
 describe GRPC::RpcDesc do

data/src/ruby/spec/generic/rpc_server_pool_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 Thread.abort_on_exception = true
 

data/src/ruby/spec/generic/service_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 require 'grpc/generic/rpc_desc'
 require 'grpc/generic/service'
 

data/src/ruby/spec/google_rpc_status_utils_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 require_relative '../lib/grpc/google_rpc_status_utils'
 require_relative '../pb/src/proto/grpc/testing/messages_pb'
 require_relative '../pb/src/proto/grpc/testing/messages_pb'
@@ -114,17 +114,6 @@ describe 'conversion from a status struct to a google protobuf status' do
   end
 end
 
-# Test message
-class EchoMsg
-  def self.marshal(_o)
-    ''
-  end
-
-  def self.unmarshal(_o)
-    EchoMsg.new
-  end
-end
-
 # A test service that fills in the "reserved" grpc-status-details-bin trailer,
 # for client-side testing of GoogleRpcStatus protobuf extraction from trailers.
 class GoogleRpcStatusTestService

data/src/ruby/spec/pb/duplicate/codegen_spec.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'spec_helper'
 require 'open3'
 require 'tmpdir'
 

data/src/ruby/spec/pb/health/checker_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 require 'grpc/health/v1/health_pb'
 require 'grpc/health/checker'
 require 'open3'

data/src/ruby/spec/server_credentials_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 def load_test_certs
   test_root = File.join(File.dirname(__FILE__), 'testdata')

data/src/ruby/spec/server_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 def load_test_certs
   test_root = File.join(File.dirname(__FILE__), 'testdata')

data/src/ruby/spec/spec_helper.rb

@@ -31,6 +31,7 @@ end if ENV['COVERAGE_NAME']
 require 'rspec'
 require 'logging'
 require 'rspec/logging_helper'
+require 'grpc'
 
 require_relative 'support/services'
 require_relative 'support/helpers'

data/src/ruby/spec/support/services.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Test stubs for various scenarios
-require 'grpc'
+require 'spec_helper'
 
 # A test message
 class EchoMsg

data/src/ruby/spec/time_consts_spec.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'grpc'
+require 'spec_helper'
 
 TimeConsts = GRPC::Core::TimeConsts
 

data/third_party/address_sorting/address_sorting.c

@@ -55,12 +55,17 @@ static const int kIPv6AddrScopeGlobal = 3;
 static address_sorting_source_addr_factory* g_current_source_addr_factory =
     NULL;
 
-static int address_sorting_get_source_addr(const address_sorting_address* dest,
-                                           address_sorting_address* source) {
+static bool address_sorting_get_source_addr(const address_sorting_address* dest,
+                                            address_sorting_address* source) {
   return g_current_source_addr_factory->vtable->get_source_addr(
       g_current_source_addr_factory, dest, source);
 }
 
+bool address_sorting_get_source_addr_for_testing(
+    const address_sorting_address* dest, address_sorting_address* source) {
+  return address_sorting_get_source_addr(dest, source);
+}
+
 static int ipv6_prefix_match_length(const struct sockaddr_in6* sa,
                                     const struct sockaddr_in6* sb) {
   unsigned char* a = (unsigned char*)&sa->sin6_addr;
@@ -225,15 +230,15 @@ static int compare_source_addr_exists(const address_sorting_sortable* first,
 static int compare_source_dest_scope_matches(
     const address_sorting_sortable* first,
     const address_sorting_sortable* second) {
-  int first_src_dst_scope_matches = 0;
+  bool first_src_dst_scope_matches = false;
   if (sockaddr_get_scope(&first->dest_addr) ==
       sockaddr_get_scope(&first->source_addr)) {
-    first_src_dst_scope_matches = 1;
+    first_src_dst_scope_matches = true;
   }
-  int second_src_dst_scope_matches = 0;
+  bool second_src_dst_scope_matches = false;
   if (sockaddr_get_scope(&second->dest_addr) ==
       sockaddr_get_scope(&second->source_addr)) {
-    second_src_dst_scope_matches = 1;
+    second_src_dst_scope_matches = true;
   }
   if (first_src_dst_scope_matches != second_src_dst_scope_matches) {
     return first_src_dst_scope_matches ? -1 : 1;
@@ -244,18 +249,18 @@ static int compare_source_dest_scope_matches(
 static int compare_source_dest_labels_match(
     const address_sorting_sortable* first,
     const address_sorting_sortable* second) {
-  int first_label_matches = 0;
+  bool first_label_matches = false;
   if (get_label_value(&first->dest_addr) ==
       get_label_value(&first->source_addr)) {
-    first_label_matches = 1;
+    first_label_matches = true;
   }
-  int second_label_matches = 0;
+  bool second_label_matches = false;
   if (get_label_value(&second->dest_addr) ==
       get_label_value(&second->source_addr)) {
-    second_label_matches = 1;
+    second_label_matches = true;
   }
   if (first_label_matches != second_label_matches) {
-    return first_label_matches ? 1 : 1;
+    return first_label_matches ? -1 : 1;
   }
   return 0;
 }
@@ -366,4 +371,5 @@ void address_sorting_shutdown() {
     abort();
   }
   g_current_source_addr_factory->vtable->destroy(g_current_source_addr_factory);
+  g_current_source_addr_factory = NULL;
 }