grpc 1.13.0.pre1 → 1.13.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 781c8064beeefe2b82099359e7d78ba7c311693b980f6400e02f2a9cdc31001b
-  data.tar.gz: 2e8f5b8f112b39fb783fba46fc09e6e519f4ac900ddbb857ba542fd390c80f8f
+  metadata.gz: 32ae15b7709e0a7111167c9cdcfe280a1ab9ffbcfec9fdd5ce063e6423de7f60
+  data.tar.gz: 6f7292710d66e521773a29d89e425a18f4a59a5552b59eaab0520b8b42f2432d
 SHA512:
-  metadata.gz: 62972154ce92dcdf0ac0fd9c2d19a0eb1900eab2a32cd7277358c286b216d49f38ebfcc5f3fd896e23c23804b9210d784e4027c670f1c3b6c3e2b64811ae7e89
-  data.tar.gz: 346fcd50a7f1a4be8f836d6792040b500210315646cfc550a27c3cf4c3f3f4d18a07362f78206193970c143da7588532d8c6dd13f79efd680fc3d1395b1d78fc
+  metadata.gz: 7690a0bc231a7e7a75175510207e5926a2f3449cc744e2e74fac224843ac04baff62576d7d1f39d21ebdb74157843e77e739991e8b218dad199b353866838228
+  data.tar.gz: d26ec45bf26cfed6a692b1fe147b064e750336c71661bf19274223249c09dec9568c5c8a7da5d9dd86e4aa10a8e97974ef4c5ac18d6f0b07ca8ec8aa643000df

data/Makefile

@@ -420,9 +420,9 @@ E = @echo
 Q = @
 endif
 
-CORE_VERSION = 6.0.0-pre1
-CPP_VERSION = 1.13.0-pre1
-CSHARP_VERSION = 1.13.0-pre1
+CORE_VERSION = 6.0.0-pre3
+CPP_VERSION = 1.13.0-pre3
+CSHARP_VERSION = 1.13.0-pre3
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/lib/channel/handshaker.cc

@@ -223,18 +223,23 @@ static bool call_next_handshaker_locked(grpc_handshake_manager* mgr,
       mgr->index == mgr->count) {
     if (error == GRPC_ERROR_NONE && mgr->shutdown) {
       error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("handshaker shutdown");
-      // TODO(roth): It is currently necessary to shutdown endpoints
-      // before destroying then, even when we know that there are no
-      // pending read/write callbacks.  This should be fixed, at which
-      // point this can be removed.
-      grpc_endpoint_shutdown(mgr->args.endpoint, GRPC_ERROR_REF(error));
-      grpc_endpoint_destroy(mgr->args.endpoint);
-      mgr->args.endpoint = nullptr;
-      grpc_channel_args_destroy(mgr->args.args);
-      mgr->args.args = nullptr;
-      grpc_slice_buffer_destroy_internal(mgr->args.read_buffer);
-      gpr_free(mgr->args.read_buffer);
-      mgr->args.read_buffer = nullptr;
+      // It is possible that the endpoint has already been destroyed by
+      // a shutdown call while this callback was sitting on the ExecCtx
+      // with no error.
+      if (mgr->args.endpoint != nullptr) {
+        // TODO(roth): It is currently necessary to shutdown endpoints
+        // before destroying then, even when we know that there are no
+        // pending read/write callbacks.  This should be fixed, at which
+        // point this can be removed.
+        grpc_endpoint_shutdown(mgr->args.endpoint, GRPC_ERROR_REF(error));
+        grpc_endpoint_destroy(mgr->args.endpoint);
+        mgr->args.endpoint = nullptr;
+        grpc_channel_args_destroy(mgr->args.args);
+        mgr->args.args = nullptr;
+        grpc_slice_buffer_destroy_internal(mgr->args.read_buffer);
+        gpr_free(mgr->args.read_buffer);
+        mgr->args.read_buffer = nullptr;
+      }
     }
     if (grpc_handshaker_trace.enabled()) {
       gpr_log(GPR_INFO,

data/src/core/lib/iomgr/exec_ctx.h

@@ -45,6 +45,9 @@ typedef struct grpc_combiner grpc_combiner;
 /* The exec_ctx's thread is (potentially) owned by a call or channel: care
    should be given to not delete said call/channel from this exec_ctx */
 #define GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP 2
+/* This exec ctx was initialized by an internal thread, and should not
+   be counted by fork handlers */
+#define GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD 4
 
 extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx;
 
@@ -93,7 +96,9 @@ class ExecCtx {
 
   /** Parameterised Constructor */
   ExecCtx(uintptr_t fl) : flags_(fl) {
-    grpc_core::Fork::IncExecCtxCount();
+    if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
+      grpc_core::Fork::IncExecCtxCount();
+    }
     Set(this);
   }
 
@@ -102,7 +107,9 @@ class ExecCtx {
     flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED;
     Flush();
     Set(last_exec_ctx_);
-    grpc_core::Fork::DecExecCtxCount();
+    if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
+      grpc_core::Fork::DecExecCtxCount();
+    }
   }
 
   /** Disallow copy and assignment operators */

data/src/core/lib/iomgr/executor.cc

@@ -145,7 +145,7 @@ static void executor_thread(void* arg) {
   thread_state* ts = static_cast<thread_state*>(arg);
   gpr_tls_set(&g_this_thread_state, (intptr_t)ts);
 
-  grpc_core::ExecCtx exec_ctx(0);
+  grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD);
 
   size_t subtract_depth = 0;
   for (;;) {

data/src/core/lib/iomgr/timer_manager.cc

@@ -265,7 +265,7 @@ static void timer_thread_cleanup(completed_thread* ct) {
 static void timer_thread(void* completed_thread_ptr) {
   // this threads exec_ctx: we try to run things through to completion here
   // since it's easy to spin up new threads
-  grpc_core::ExecCtx exec_ctx(0);
+  grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD);
   timer_main_loop();
 
   timer_thread_cleanup(static_cast<completed_thread*>(completed_thread_ptr));

data/src/core/lib/surface/version.cc

@@ -23,6 +23,6 @@
 
 #include <grpc/grpc.h>
 
-const char* grpc_version_string(void) { return "6.0.0-pre1"; }
+const char* grpc_version_string(void) { return "6.0.0-pre3"; }
 
 const char* grpc_g_stands_for(void) { return "gloriosa"; }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.13.0.pre1
+  version: 1.13.0.pre3
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -1547,39 +1547,39 @@ signing_key:
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/error_sanity_spec.rb
-- src/ruby/spec/call_spec.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/generic/rpc_desc_spec.rb
-- src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/generic/client_interceptors_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb
-- src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/testdata/server1.key
 - src/ruby/spec/testdata/client.pem
-- src/ruby/spec/testdata/ca.pem
 - src/ruby/spec/testdata/client.key
 - src/ruby/spec/testdata/server1.pem
-- src/ruby/spec/testdata/server1.key
+- src/ruby/spec/testdata/ca.pem
 - src/ruby/spec/testdata/README
 - src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/pb/package_with_underscore/checker_spec.rb
-- src/ruby/spec/pb/package_with_underscore/service.proto
-- src/ruby/spec/pb/package_with_underscore/data.proto
+- src/ruby/spec/channel_spec.rb
 - src/ruby/spec/pb/health/checker_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/pb/package_with_underscore/service.proto
+- src/ruby/spec/pb/package_with_underscore/checker_spec.rb
+- src/ruby/spec/pb/package_with_underscore/data.proto
+- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/generic/rpc_server_pool_spec.rb
+- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/client_interceptors_spec.rb
+- src/ruby/spec/generic/interceptor_registry_spec.rb
+- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/generic/client_stub_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/client_server_spec.rb
 - src/ruby/spec/server_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/call_credentials_spec.rb
 - src/ruby/spec/spec_helper.rb
-- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/compression_options_spec.rb
+- src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/call_spec.rb