grpc 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85078f204d4c44d50c6f889a82228c659fecad14a61a436a2ca38d696d6cf1b
-  data.tar.gz: 4d09c33a0e9045449b97f4590157ee0a60135519e8c63d22ed7b2b8925c383ec
+  metadata.gz: 24050851b081aa76726e4c770f33d3d05423fb4354553398002a013ab82c0a83
+  data.tar.gz: 20d0b631456585eb90d7f35e6e6da85e465e24dac5b9fa474169fcb4f327e395
 SHA512:
-  metadata.gz: 8281aaf0f79317a724ec32374c468a9f197e4b26f6b9ecf42756118a16e4998fd21fae8fef67869e91b073b2570d4e628bf30c96e37e46e24617d242b65b5f78
-  data.tar.gz: fb6b58e34f642f277528cfc9e1e185d0a5d68257b56e0982d67c9ac08e068c4f977ecd3002dc57a19e8e60805239037517d9368ee92cbe7b3988cdc965ed69c0
+  metadata.gz: 8a01d548fc008c9eda1ae178bbe9d6cebbb3f754454c436821b0df96f2efdb520c72ad1409d99892a1889bf09731e58eb6f1ecb84db1da02a39d75e43d78aafa
+  data.tar.gz: fba1972a421c4e00bdbbf33a35b0a0ffbcd15c737ef27e56b77e8d3823a778f16f6aca4cfb1c6a3be24afe9f623b6a5c39f5611eb8dc8030c2e43532e41dccb1

data/Makefile

@@ -421,8 +421,8 @@ Q = @
 endif
 
 CORE_VERSION = 6.0.0
-CPP_VERSION = 1.11.0
-CSHARP_VERSION = 1.11.0
+CPP_VERSION = 1.11.1
+CSHARP_VERSION = 1.11.1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc

@@ -135,6 +135,7 @@ AresDnsResolver::AresDnsResolver(const ResolverArgs& args)
   if (path[0] == '/') ++path;
   name_to_resolve_ = gpr_strdup(path);
   // Get DNS server from URI authority.
+  dns_server_ = nullptr;
   if (0 != strcmp(args.uri->authority, "")) {
     dns_server_ = gpr_strdup(args.uri->authority);
   }
@@ -362,6 +363,15 @@ void AresDnsResolver::OnResolvedLocked(void* arg, grpc_error* error) {
 }
 
 void AresDnsResolver::MaybeStartResolvingLocked() {
+  // If there is an existing timer, the time it fires is the earliest time we
+  // can start the next resolution.
+  if (have_next_resolution_timer_) {
+    // TODO(dgq): remove the following two lines once Pick First stops
+    // discarding subchannels after selecting.
+    ++resolved_version_;
+    MaybeFinishNextLocked();
+    return;
+  }
   if (last_resolution_timestamp_ >= 0) {
     const grpc_millis earliest_next_resolution =
         last_resolution_timestamp_ + min_time_between_resolutions_;
@@ -374,17 +384,15 @@ void AresDnsResolver::MaybeStartResolvingLocked() {
               "In cooldown from last resolution (from %" PRIdPTR
               " ms ago). Will resolve again in %" PRIdPTR " ms",
               last_resolution_ago, ms_until_next_resolution);
-      if (!have_next_resolution_timer_) {
-        have_next_resolution_timer_ = true;
-        // TODO(roth): We currently deal with this ref manually.  Once the
-        // new closure API is done, find a way to track this ref with the timer
-        // callback as part of the type system.
-        RefCountedPtr<Resolver> self =
-            Ref(DEBUG_LOCATION, "next_resolution_timer_cooldown");
-        self.release();
-        grpc_timer_init(&next_resolution_timer_, ms_until_next_resolution,
-                        &on_next_resolution_);
-      }
+      have_next_resolution_timer_ = true;
+      // TODO(roth): We currently deal with this ref manually.  Once the
+      // new closure API is done, find a way to track this ref with the timer
+      // callback as part of the type system.
+      RefCountedPtr<Resolver> self =
+          Ref(DEBUG_LOCATION, "next_resolution_timer_cooldown");
+      self.release();
+      grpc_timer_init(&next_resolution_timer_, ms_until_next_resolution,
+                      &on_next_resolution_);
       // TODO(dgq): remove the following two lines once Pick First stops
       // discarding subchannels after selecting.
       ++resolved_version_;
@@ -396,6 +404,7 @@ void AresDnsResolver::MaybeStartResolvingLocked() {
 }
 
 void AresDnsResolver::StartResolvingLocked() {
+  gpr_log(GPR_DEBUG, "Start resolving.");
   // TODO(roth): We currently deal with this ref manually.  Once the
   // new closure API is done, find a way to track this ref with the timer
   // callback as part of the type system.

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc

@@ -153,7 +153,10 @@ static void grpc_ares_request_unref(grpc_ares_request* r) {
   /* If there are no pending queries, invoke on_done callback and destroy the
      request */
   if (gpr_unref(&r->pending_queries)) {
-    grpc_cares_wrapper_address_sorting_sort(*(r->lb_addrs_out));
+    grpc_lb_addresses* lb_addrs = *(r->lb_addrs_out);
+    if (lb_addrs != nullptr) {
+      grpc_cares_wrapper_address_sorting_sort(lb_addrs);
+    }
     GRPC_CLOSURE_SCHED(r->on_done, r->error);
     gpr_mu_destroy(&r->mu);
     grpc_ares_ev_driver_destroy(r->ev_driver);

data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc

@@ -236,6 +236,15 @@ void NativeDnsResolver::OnResolvedLocked(void* arg, grpc_error* error) {
 }
 
 void NativeDnsResolver::MaybeStartResolvingLocked() {
+  // If there is an existing timer, the time it fires is the earliest time we
+  // can start the next resolution.
+  if (have_next_resolution_timer_) {
+    // TODO(dgq): remove the following two lines once Pick First stops
+    // discarding subchannels after selecting.
+    ++resolved_version_;
+    MaybeFinishNextLocked();
+    return;
+  }
   if (last_resolution_timestamp_ >= 0) {
     const grpc_millis earliest_next_resolution =
         last_resolution_timestamp_ + min_time_between_resolutions_;
@@ -248,17 +257,15 @@ void NativeDnsResolver::MaybeStartResolvingLocked() {
               "In cooldown from last resolution (from %" PRIdPTR
               " ms ago). Will resolve again in %" PRIdPTR " ms",
               last_resolution_ago, ms_until_next_resolution);
-      if (!have_next_resolution_timer_) {
-        have_next_resolution_timer_ = true;
-        // TODO(roth): We currently deal with this ref manually.  Once the
-        // new closure API is done, find a way to track this ref with the timer
-        // callback as part of the type system.
-        RefCountedPtr<Resolver> self =
-            Ref(DEBUG_LOCATION, "next_resolution_timer_cooldown");
-        self.release();
-        grpc_timer_init(&next_resolution_timer_, ms_until_next_resolution,
-                        &on_next_resolution_);
-      }
+      have_next_resolution_timer_ = true;
+      // TODO(roth): We currently deal with this ref manually.  Once the
+      // new closure API is done, find a way to track this ref with the timer
+      // callback as part of the type system.
+      RefCountedPtr<Resolver> self =
+          Ref(DEBUG_LOCATION, "next_resolution_timer_cooldown");
+      self.release();
+      grpc_timer_init(&next_resolution_timer_, ms_until_next_resolution,
+                      &on_next_resolution_);
       // TODO(dgq): remove the following two lines once Pick First stops
       // discarding subchannels after selecting.
       ++resolved_version_;
@@ -270,6 +277,7 @@ void NativeDnsResolver::MaybeStartResolvingLocked() {
 }
 
 void NativeDnsResolver::StartResolvingLocked() {
+  gpr_log(GPR_DEBUG, "Start resolving.");
   // TODO(roth): We currently deal with this ref manually.  Once the
   // new closure API is done, find a way to track this ref with the timer
   // callback as part of the type system.

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.11.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -1549,38 +1549,38 @@ specification_version: 4
 summary: GRPC system in Ruby
 test_files:
 - src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/compression_options_spec.rb
 - src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/pb/health/checker_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/spec_helper.rb
-- src/ruby/spec/server_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/call_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/channel_spec.rb
-- src/ruby/spec/error_sanity_spec.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/server_credentials_spec.rb
 - src/ruby/spec/generic/interceptor_registry_spec.rb
+- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/generic/client_stub_spec.rb
 - src/ruby/spec/generic/server_interceptors_spec.rb
-- src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/rpc_desc_spec.rb
 - src/ruby/spec/generic/client_interceptors_spec.rb
-- src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/generic/active_call_spec.rb
 - src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/testdata/client.key
-- src/ruby/spec/testdata/README
-- src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/client.pem
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/pb/package_with_underscore/checker_spec.rb
+- src/ruby/spec/pb/package_with_underscore/data.proto
+- src/ruby/spec/pb/package_with_underscore/service.proto
+- src/ruby/spec/pb/duplicate/codegen_spec.rb
+- src/ruby/spec/pb/health/checker_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/call_spec.rb
+- src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/spec_helper.rb
 - src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/client.pem
 - src/ruby/spec/testdata/server1.key
+- src/ruby/spec/testdata/README
+- src/ruby/spec/testdata/client.key
+- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/compression_options_spec.rb