grpc 1.57.0.pre1-x86_64-darwin → 1.58.0.pre1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7724bced5bee7c1f03d2796a446e8d8a18744a3f21fb7f422a356c8210d16369
-  data.tar.gz: b48e66eba8fcf7969d0271912cdf78b5d0d1a562185b1c603334f16abe955b6f
+  metadata.gz: 98efe43d842baa93b24f47e2dc4f5630e8b2b09bfe14465ea7c98b0bea621d77
+  data.tar.gz: e3c691daf0cf1d3c6b73fefc6d6699a08d3cb39c1a449581a4424436d2f35de6
 SHA512:
-  metadata.gz: 89467c24959e9d967b5d8d024d15dc89a38b678c62fb8bba448649a812ffc366f9ac5b08fd6aedce22285ecdbb6ef2bbed2d521384f18af0060cec38c6960cdc
-  data.tar.gz: 543c1b4d47bd1fb17e3e45210a1856c55eb10d029725684d02bbdeb6313b2335ade454ac80f726d4fd206f66f66112cb0c4164c555fbc8f5402dddaed2a52eb0
+  metadata.gz: 1842c7e7ad8b4391f037e9054687b88188ed91aaa1e958129c0129aaabea38fff58f8f84cd7ec50ae57f3ac9415c9c6540bf58faf949fc3bade3013ee4550215
+  data.tar.gz: 79d91b5dd824e6e65c74618896a4bce8b46a631f1e1d1509b68343b768aa6191715771f54d6f31c03d09eacbd1355b18c5d1c9cd4994b66f68264419eb470030

data/src/ruby/ext/grpc/rb_channel.c

@@ -97,8 +97,6 @@ static bg_watched_channel* bg_watched_channel_list_head = NULL;
 
 static void grpc_rb_channel_try_register_connection_polling(
     bg_watched_channel* bg);
-static void* wait_until_channel_polling_thread_started_no_gil(void*);
-static void wait_until_channel_polling_thread_started_unblocking_func(void*);
 static void* channel_init_try_register_connection_polling_without_gil(
     void* arg);
 
@@ -111,7 +109,6 @@ static grpc_completion_queue* g_channel_polling_cq;
 static gpr_mu global_connection_polling_mu;
 static gpr_cv global_connection_polling_cv;
 static int g_abort_channel_polling = 0;
-static int g_channel_polling_thread_started = 0;
 static gpr_once g_once_init = GPR_ONCE_INIT;
 static VALUE g_channel_polling_thread = Qnil;
 
@@ -224,12 +221,6 @@ static VALUE grpc_rb_channel_init(int argc, VALUE* argv, VALUE self) {
   channel_init_try_register_stack stack;
 
   grpc_ruby_fork_guard();
-  int stop_waiting_for_thread_start = 0;
-  rb_thread_call_without_gvl(
-      wait_until_channel_polling_thread_started_no_gil,
-      &stop_waiting_for_thread_start,
-      wait_until_channel_polling_thread_started_unblocking_func,
-      &stop_waiting_for_thread_start);
   /* "3" == 3 mandatory args */
   rb_scan_args(argc, argv, "3", &target, &channel_args, &credentials);
 
@@ -286,7 +277,6 @@ static void* get_state_without_gil(void* arg) {
   get_state_stack* stack = (get_state_stack*)arg;
 
   gpr_mu_lock(&global_connection_polling_mu);
-  GPR_ASSERT(g_abort_channel_polling || g_channel_polling_thread_started);
   if (stack->bg->channel_destroyed) {
     stack->out = GRPC_CHANNEL_SHUTDOWN;
   } else {
@@ -423,15 +413,8 @@ static void grpc_rb_channel_maybe_recreate_channel_after_fork(
   bg_watched_channel* bg = wrapper->bg_wrapped;
   if (bg->channel_destroyed) {
     // There must be one ref at this point, held by the ruby-level channel
-    // object.
+    // object, drop this one here.
     GPR_ASSERT(bg->refcount == 1);
-    // Wait for channel polling thread to re-initialize
-    int stop_waiting_for_thread_start = 0;
-    rb_thread_call_without_gvl(
-        wait_until_channel_polling_thread_started_no_gil,
-        &stop_waiting_for_thread_start,
-        wait_until_channel_polling_thread_started_unblocking_func,
-        &stop_waiting_for_thread_start);
     rb_thread_call_without_gvl(channel_safe_destroy_without_gil, bg, NULL,
                                NULL);
     // re-create C-core channel
@@ -635,9 +618,6 @@ static void grpc_rb_channel_try_register_connection_polling(
     bg_watched_channel* bg) {
   grpc_connectivity_state conn_state;
   watch_state_op* op = NULL;
-
-  GPR_ASSERT(g_channel_polling_thread_started || g_abort_channel_polling);
-
   if (bg->refcount == 0) {
     GPR_ASSERT(bg->channel_destroyed);
     bg_watched_channel_list_free_and_remove(bg);
@@ -647,7 +627,6 @@ static void grpc_rb_channel_try_register_connection_polling(
   if (bg->channel_destroyed || g_abort_channel_polling) {
     return;
   }
-
   conn_state = grpc_channel_check_connectivity_state(bg->channel, 0);
   if (conn_state == GRPC_CHANNEL_SHUTDOWN) {
     return;
@@ -655,7 +634,6 @@ static void grpc_rb_channel_try_register_connection_polling(
   GPR_ASSERT(bg_watched_channel_list_lookup(bg));
   // prevent bg from being free'd by GC while background thread is watching it
   bg->refcount++;
-
   op = gpr_zalloc(sizeof(watch_state_op));
   op->op_type = CONTINUOUS_WATCH;
   op->op.continuous_watch_callback_args.bg = bg;
@@ -678,9 +656,6 @@ static void* run_poll_channels_loop_no_gil(void* arg) {
   gpr_log(GPR_DEBUG, "GRPC_RUBY: run_poll_channels_loop_no_gil - begin");
 
   gpr_mu_lock(&global_connection_polling_mu);
-  GPR_ASSERT(!g_abort_channel_polling);
-  GPR_ASSERT(!g_channel_polling_thread_started);
-  g_channel_polling_thread_started = 1;
   gpr_cv_broadcast(&global_connection_polling_cv);
   gpr_mu_unlock(&global_connection_polling_mu);
 
@@ -761,31 +736,6 @@ static VALUE run_poll_channels_loop(VALUE arg) {
   return Qnil;
 }
 
-static void* wait_until_channel_polling_thread_started_no_gil(void* arg) {
-  int* stop_waiting = (int*)arg;
-  gpr_log(GPR_DEBUG, "GRPC_RUBY: wait for channel polling thread to start");
-  gpr_mu_lock(&global_connection_polling_mu);
-  while (!g_channel_polling_thread_started && !g_abort_channel_polling &&
-         !*stop_waiting) {
-    gpr_cv_wait(&global_connection_polling_cv, &global_connection_polling_mu,
-                gpr_inf_future(GPR_CLOCK_REALTIME));
-  }
-  gpr_mu_unlock(&global_connection_polling_mu);
-
-  return NULL;
-}
-
-static void wait_until_channel_polling_thread_started_unblocking_func(
-    void* arg) {
-  int* stop_waiting = (int*)arg;
-  gpr_mu_lock(&global_connection_polling_mu);
-  gpr_log(GPR_DEBUG,
-          "GRPC_RUBY: interrupt wait for channel polling thread to start");
-  *stop_waiting = 1;
-  gpr_cv_broadcast(&global_connection_polling_cv);
-  gpr_mu_unlock(&global_connection_polling_mu);
-}
-
 static void* set_abort_channel_polling_without_gil(void* arg) {
   (void)arg;
   gpr_mu_lock(&global_connection_polling_mu);
@@ -814,7 +764,6 @@ void grpc_rb_channel_polling_thread_start() {
   gpr_once_init(&g_once_init, do_basic_init);
   GPR_ASSERT(!RTEST(g_channel_polling_thread));
   GPR_ASSERT(!g_abort_channel_polling);
-  GPR_ASSERT(!g_channel_polling_thread_started);
   GPR_ASSERT(g_channel_polling_cq == NULL);
 
   g_channel_polling_cq = grpc_completion_queue_create_for_next(NULL);
@@ -841,7 +790,6 @@ void grpc_rb_channel_polling_thread_stop() {
   // we can start again later
   g_channel_polling_thread = Qnil;
   g_abort_channel_polling = false;
-  g_channel_polling_thread_started = false;
   g_channel_polling_cq = NULL;
 }
 

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

@@ -232,17 +232,16 @@ module GRPC
     def server_unary_response(req, trailing_metadata: {},
                               code: Core::StatusCodes::OK, details: 'OK')
       ops = {}
+      ops[SEND_MESSAGE] = @marshal.call(req)
+      ops[SEND_STATUS_FROM_SERVER] = Struct::Status.new(
+        code, details, trailing_metadata)
+      ops[RECV_CLOSE_ON_SERVER] = nil
+
       @send_initial_md_mutex.synchronize do
         ops[SEND_INITIAL_METADATA] = @metadata_to_send unless @metadata_sent
         @metadata_sent = true
       end
 
-      payload = @marshal.call(req)
-      ops[SEND_MESSAGE] = payload
-      ops[SEND_STATUS_FROM_SERVER] = Struct::Status.new(
-        code, details, trailing_metadata)
-      ops[RECV_CLOSE_ON_SERVER] = nil
-
       @call.run_batch(ops)
       set_output_stream_done
     end
@@ -262,6 +261,9 @@ module GRPC
         @metadata_received = true
       end
       get_message_from_batch_result(batch_result)
+    rescue GRPC::Core::CallError => e
+      GRPC.logger.info("remote_read: #{e}")
+      nil
     end
 
     def get_message_from_batch_result(recv_message_batch_result)
@@ -328,14 +330,7 @@ module GRPC
     def each_remote_read_then_finish
       return enum_for(:each_remote_read_then_finish) unless block_given?
       loop do
-        resp =
-          begin
-            remote_read
-          rescue GRPC::Core::CallError => e
-            GRPC.logger.warn("In each_remote_read_then_finish: #{e}")
-            nil
-          end
-
+        resp = remote_read
         break if resp.nil?  # the last response was received
         yield resp
       end

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

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.57.0.pre1'
+  VERSION = '1.58.0.pre1'
 end

data/src/ruby/pb/test/client.rb

@@ -649,6 +649,22 @@ class NamedTests
 
   end
 
+  def special_status_message
+    code = GRPC::Core::StatusCodes::UNKNOWN
+    message = "\t\ntest with whitespace\r\nand Unicode BMP ☺ and non-BMP 😈\t\n"
+    req = SimpleRequest.new(
+      response_status: EchoStatus.new(code: code, message: message))
+    begin
+      resp = @stub.unary_call(req)
+      fail AssertionError, "GRPC::Unknown should have been raised."
+    rescue GRPC::Unknown => e
+      if e.details.force_encoding("UTF-8") != message
+        fail AssertionError,
+          "Expected message #{message}. Received: #{e.details}"
+      end
+    end
+  end
+
   def all
     all_methods = NamedTests.instance_methods(false).map(&:to_s)
     all_methods.each do |m|

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

@@ -668,9 +668,9 @@ describe GRPC::RpcServer do
       def check_multi_req_view_of_finished_call(call)
         common_check_of_finished_server_call(call)
 
-        expect do
-          call.each_remote_read.each { |r| p r }
-        end.to raise_error(GRPC::Core::CallError)
+        l = []
+        call.each_remote_read.each { |r| l << r }
+        expect(l.size).to eq(0)
       end
 
       def common_check_of_finished_server_call(call)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.57.0.pre1
+  version: 1.58.0.pre1
 platform: x86_64-darwin
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -182,22 +182,16 @@ dependencies:
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
 description: Send RPCs from Ruby using GRPC
 email: grpc-io@googlegroups.com
 executables: []
@@ -359,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby