grpc 1.40.0.pre1 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf4977eb9d4631eb3f57dd3a14819a47b396e4b168d4c8bd71940ae67e702a07
-  data.tar.gz: 1556459d6ed1ef4b6e6109be093f81122d90cc4dc49e4b0a07b607d9f152cdf6
+  metadata.gz: 18e1fa5db1d34b00db88443732e9ab881337cd91a8f57063562a41ee26e7e57b
+  data.tar.gz: ff23dac20d0aa6708db1b5d6cb7b8416b93e83d8e8a919154b885f4b7bebceb2
 SHA512:
-  metadata.gz: e5ae2edd3bd04dc52f9c865999fa2e26e22f9af1df05852235ff01fbbf25ee6a9ab4a2efd69a2ce87f221b8e41d97ff966b554c1a3ad3bc597e1494140517701
-  data.tar.gz: 4d15ba612d2a2ecb754eab736a7dd99b93d1821e572c7ff697b5d6d397d54c1220e3f0091550377ddc5af2eb3694ff2fb4495ac8fd05c7679bbb3e57bd31d6a4
+  metadata.gz: 8dc580b40de3574c01c9d1c3e5e863c75c2a4e58959ae069b586f013c2cdcc1021a087c54a9df01fc714c8c6091bd47972e0f446394ae1e7abd2a47b157b83d0
+  data.tar.gz: 9ce91a5beccbfeb22a89f5a9d4c22047f718e8a0b800de36121b459340f343b30a0799672ce8ac7c9c14d15d4403e2056c35edd1b46739b276155a4e7fc15f59

data/Makefile

@@ -455,8 +455,8 @@ Q = @
 endif
 
 CORE_VERSION = 18.0.0
-CPP_VERSION = 1.40.0-pre1
-CSHARP_VERSION = 2.40.0-pre1
+CPP_VERSION = 1.40.0
+CSHARP_VERSION = 2.40.0
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/ext/filters/client_channel/retry_filter.cc

@@ -88,9 +88,7 @@
 
 // TODO(roth): In subsequent PRs:
 // - add support for transparent retries (including initial metadata)
-// - figure out how to record stats in census for retries
-//   (census filter is on top of this one)
-// - add census stats for retries
+// - implement hedging
 
 // By default, we buffer 256 KiB per RPC for retries.
 // TODO(roth): Do we have any data to suggest a better value?
@@ -539,6 +537,8 @@ class RetryFilter::CallData {
   CallCombiner* call_combiner_;
   grpc_call_context_element* call_context_;
 
+  grpc_error_handle cancelled_from_surface_ = GRPC_ERROR_NONE;
+
   RefCountedPtr<CallStackDestructionBarrier> call_stack_destruction_barrier_;
 
   // TODO(roth): As part of implementing hedging, we will need to maintain a
@@ -2141,6 +2141,7 @@ RetryFilter::CallData::~CallData() {
   for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) {
     GPR_ASSERT(pending_batches_[i].batch == nullptr);
   }
+  GRPC_ERROR_UNREF(cancelled_from_surface_);
 }
 
 void RetryFilter::CallData::StartTransportStreamOpBatch(
@@ -2173,6 +2174,9 @@ void RetryFilter::CallData::StartTransportStreamOpBatch(
       call_attempt_->CancelFromSurface(batch);
       return;
     }
+    // Save cancel_error in case subsequent batches are started.
+    GRPC_ERROR_UNREF(cancelled_from_surface_);
+    cancelled_from_surface_ = GRPC_ERROR_REF(cancel_error);
     // Cancel retry timer.
     if (retry_timer_pending_) {
       if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) {
@@ -2201,6 +2205,15 @@ void RetryFilter::CallData::StartTransportStreamOpBatch(
   }
   // If we do not yet have a call attempt, create one.
   if (call_attempt_ == nullptr) {
+    // If we were previously cancelled from the surface, cancel this
+    // batch instead of creating a call attempt.
+    if (cancelled_from_surface_ != GRPC_ERROR_NONE) {
+      PendingBatchClear(pending);
+      // Note: This will release the call combiner.
+      grpc_transport_stream_op_batch_finish_with_failure(
+          batch, GRPC_ERROR_REF(cancelled_from_surface_), call_combiner_);
+      return;
+    }
     // If there is no retry policy, then commit retries immediately.
     // This ensures that the code below will always jump to the fast path.
     // TODO(roth): Remove this special case when we implement

data/src/core/ext/xds/xds_api.cc

@@ -115,17 +115,6 @@ bool XdsAggregateAndLogicalDnsClusterEnabled() {
   return parse_succeeded && parsed_value;
 }
 
-// TODO(donnadionne): Check to see if ring hash policy is enabled, this will be
-// removed once ring hash policy is fully integration-tested and enabled by
-// default.
-bool XdsRingHashEnabled() {
-  char* value = gpr_getenv("GRPC_XDS_EXPERIMENTAL_ENABLE_RING_HASH");
-  bool parsed_value;
-  bool parse_succeeded = gpr_parse_bool_value(value, &parsed_value);
-  gpr_free(value);
-  return parse_succeeded && parsed_value;
-}
-
 // TODO(yashykt): Check to see if xDS security is enabled. This will be
 // removed once this feature is fully integration-tested and enabled by
 // default.
@@ -1751,81 +1740,78 @@ grpc_error_handle RouteActionParse(const EncodingContext& context,
     }
   }
   // Get HashPolicy from RouteAction
-  if (XdsRingHashEnabled()) {
-    size_t size = 0;
-    const envoy_config_route_v3_RouteAction_HashPolicy* const* hash_policies =
-        envoy_config_route_v3_RouteAction_hash_policy(route_action, &size);
-    for (size_t i = 0; i < size; ++i) {
-      const envoy_config_route_v3_RouteAction_HashPolicy* hash_policy =
-          hash_policies[i];
-      XdsApi::Route::HashPolicy policy;
-      policy.terminal =
-          envoy_config_route_v3_RouteAction_HashPolicy_terminal(hash_policy);
-      const envoy_config_route_v3_RouteAction_HashPolicy_Header* header;
-      const envoy_config_route_v3_RouteAction_HashPolicy_FilterState*
-          filter_state;
-      if ((header = envoy_config_route_v3_RouteAction_HashPolicy_header(
-               hash_policy)) != nullptr) {
-        policy.type = XdsApi::Route::HashPolicy::Type::HEADER;
-        policy.header_name = UpbStringToStdString(
-            envoy_config_route_v3_RouteAction_HashPolicy_Header_header_name(
-                header));
-        const struct envoy_type_matcher_v3_RegexMatchAndSubstitute*
-            regex_rewrite =
-                envoy_config_route_v3_RouteAction_HashPolicy_Header_regex_rewrite(
-                    header);
-        if (regex_rewrite != nullptr) {
-          const envoy_type_matcher_v3_RegexMatcher* regex_matcher =
-              envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(
-                  regex_rewrite);
-          if (regex_matcher == nullptr) {
-            gpr_log(
-                GPR_DEBUG,
-                "RouteAction HashPolicy contains policy specifier Header with "
-                "RegexMatchAndSubstitution but RegexMatcher pattern is "
-                "missing");
-            continue;
-          }
-          RE2::Options options;
-          policy.regex = absl::make_unique<RE2>(
-              UpbStringToStdString(
-                  envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher)),
-              options);
-          if (!policy.regex->ok()) {
-            gpr_log(
-                GPR_DEBUG,
-                "RouteAction HashPolicy contains policy specifier Header with "
-                "RegexMatchAndSubstitution but RegexMatcher pattern does not "
-                "compile");
-            continue;
-          }
-          policy.regex_substitution = UpbStringToStdString(
-              envoy_type_matcher_v3_RegexMatchAndSubstitute_substitution(
-                  regex_rewrite));
+  size_t size = 0;
+  const envoy_config_route_v3_RouteAction_HashPolicy* const* hash_policies =
+      envoy_config_route_v3_RouteAction_hash_policy(route_action, &size);
+  for (size_t i = 0; i < size; ++i) {
+    const envoy_config_route_v3_RouteAction_HashPolicy* hash_policy =
+        hash_policies[i];
+    XdsApi::Route::HashPolicy policy;
+    policy.terminal =
+        envoy_config_route_v3_RouteAction_HashPolicy_terminal(hash_policy);
+    const envoy_config_route_v3_RouteAction_HashPolicy_Header* header;
+    const envoy_config_route_v3_RouteAction_HashPolicy_FilterState*
+        filter_state;
+    if ((header = envoy_config_route_v3_RouteAction_HashPolicy_header(
+             hash_policy)) != nullptr) {
+      policy.type = XdsApi::Route::HashPolicy::Type::HEADER;
+      policy.header_name = UpbStringToStdString(
+          envoy_config_route_v3_RouteAction_HashPolicy_Header_header_name(
+              header));
+      const struct envoy_type_matcher_v3_RegexMatchAndSubstitute*
+          regex_rewrite =
+              envoy_config_route_v3_RouteAction_HashPolicy_Header_regex_rewrite(
+                  header);
+      if (regex_rewrite != nullptr) {
+        const envoy_type_matcher_v3_RegexMatcher* regex_matcher =
+            envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(
+                regex_rewrite);
+        if (regex_matcher == nullptr) {
+          gpr_log(
+              GPR_DEBUG,
+              "RouteAction HashPolicy contains policy specifier Header with "
+              "RegexMatchAndSubstitution but RegexMatcher pattern is "
+              "missing");
+          continue;
         }
-      } else if ((filter_state =
-                      envoy_config_route_v3_RouteAction_HashPolicy_filter_state(
-                          hash_policy)) != nullptr) {
-        std::string key = UpbStringToStdString(
-            envoy_config_route_v3_RouteAction_HashPolicy_FilterState_key(
-                filter_state));
-        if (key == "io.grpc.channel_id") {
-          policy.type = XdsApi::Route::HashPolicy::Type::CHANNEL_ID;
-        } else {
-          gpr_log(GPR_DEBUG,
-                  "RouteAction HashPolicy contains policy specifier "
-                  "FilterState but "
-                  "key is not io.grpc.channel_id.");
+        RE2::Options options;
+        policy.regex = absl::make_unique<RE2>(
+            UpbStringToStdString(
+                envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher)),
+            options);
+        if (!policy.regex->ok()) {
+          gpr_log(
+              GPR_DEBUG,
+              "RouteAction HashPolicy contains policy specifier Header with "
+              "RegexMatchAndSubstitution but RegexMatcher pattern does not "
+              "compile");
           continue;
         }
+        policy.regex_substitution = UpbStringToStdString(
+            envoy_type_matcher_v3_RegexMatchAndSubstitute_substitution(
+                regex_rewrite));
+      }
+    } else if ((filter_state =
+                    envoy_config_route_v3_RouteAction_HashPolicy_filter_state(
+                        hash_policy)) != nullptr) {
+      std::string key = UpbStringToStdString(
+          envoy_config_route_v3_RouteAction_HashPolicy_FilterState_key(
+              filter_state));
+      if (key == "io.grpc.channel_id") {
+        policy.type = XdsApi::Route::HashPolicy::Type::CHANNEL_ID;
       } else {
-        gpr_log(
-            GPR_DEBUG,
-            "RouteAction HashPolicy contains unsupported policy specifier.");
+        gpr_log(GPR_DEBUG,
+                "RouteAction HashPolicy contains policy specifier "
+                "FilterState but "
+                "key is not io.grpc.channel_id.");
         continue;
       }
-      route->hash_policies.emplace_back(std::move(policy));
+    } else {
+      gpr_log(GPR_DEBUG,
+              "RouteAction HashPolicy contains unsupported policy specifier.");
+      continue;
     }
+    route->hash_policies.emplace_back(std::move(policy));
   }
   // Get retry policy
   const envoy_config_route_v3_RetryPolicy* retry_policy =
@@ -3174,9 +3160,8 @@ grpc_error_handle CdsResponseParse(
     if (envoy_config_cluster_v3_Cluster_lb_policy(cluster) ==
         envoy_config_cluster_v3_Cluster_ROUND_ROBIN) {
       cds_update.lb_policy = "ROUND_ROBIN";
-    } else if (XdsRingHashEnabled() &&
-               envoy_config_cluster_v3_Cluster_lb_policy(cluster) ==
-                   envoy_config_cluster_v3_Cluster_RING_HASH) {
+    } else if (envoy_config_cluster_v3_Cluster_lb_policy(cluster) ==
+               envoy_config_cluster_v3_Cluster_RING_HASH) {
       cds_update.lb_policy = "RING_HASH";
       // Record ring hash lb config
       auto* ring_hash_config =

data/src/core/lib/slice/slice.cc

@@ -223,11 +223,21 @@ grpc_core::UnmanagedMemorySlice::UnmanagedMemorySlice(const char* source)
                                                             strlen(source)) {}
 
 grpc_slice grpc_slice_from_copied_buffer(const char* source, size_t length) {
-  return grpc_core::UnmanagedMemorySlice(source, length);
+  grpc_slice slice;
+  if (length <= sizeof(slice.data.inlined.bytes)) {
+    slice.refcount = nullptr;
+    slice.data.inlined.length = length;
+  } else {
+    // Create a ref-counted slice.
+    slice = grpc_core::UnmanagedMemorySlice(
+        length, grpc_core::UnmanagedMemorySlice::ForceHeapAllocation());
+  }
+  memcpy(GRPC_SLICE_START_PTR(slice), source, length);
+  return slice;
 }
 
 grpc_slice grpc_slice_from_copied_string(const char* source) {
-  return grpc_core::UnmanagedMemorySlice(source, strlen(source));
+  return grpc_slice_from_copied_buffer(source, strlen(source));
 }
 
 grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,

data/src/core/lib/transport/metadata_batch.cc

@@ -401,9 +401,20 @@ void grpc_metadata_batch_copy(grpc_metadata_batch* src,
   size_t i = 0;
   for (grpc_linked_mdelem* elem = src->list.head; elem != nullptr;
        elem = elem->next) {
+    // If the mdelem is not external, take a ref.
+    // Otherwise, create a new copy, holding its own refs to the
+    // underlying slices.
+    grpc_mdelem md;
+    if (GRPC_MDELEM_STORAGE(elem->md) != GRPC_MDELEM_STORAGE_EXTERNAL) {
+      md = GRPC_MDELEM_REF(elem->md);
+    } else {
+      md = grpc_mdelem_from_slices(
+          grpc_slice_ref_internal(GRPC_MDKEY(elem->md)),
+          grpc_slice_ref_internal(GRPC_MDVALUE(elem->md)));
+    }
     // Error unused in non-debug builds.
-    grpc_error_handle GRPC_UNUSED error = grpc_metadata_batch_add_tail(
-        dst, &storage[i++], GRPC_MDELEM_REF(elem->md));
+    grpc_error_handle GRPC_UNUSED error =
+        grpc_metadata_batch_add_tail(dst, &storage[i++], md);
     // The only way that grpc_metadata_batch_add_tail() can fail is if
     // there's a duplicate entry for a callout.  However, that can't be
     // the case here, because we would not have been allowed to create

data/src/core/lib/transport/metadata_batch.h

@@ -196,6 +196,13 @@ void grpc_metadata_batch_assert_ok(grpc_metadata_batch* batch);
 
 /// Copies \a src to \a dst.  \a storage must point to an array of
 /// \a grpc_linked_mdelem structs of at least the same size as \a src.
+///
+/// For each mdelem in \a src, if the mdelem is of storage types
+/// GRPC_MDELEM_STORAGE_INTERNED or GRPC_MDELEM_STORAGE_ALLOCATED,
+/// refs the original mdelem for the copy.  Otherwise, makes a new
+/// mdelem that will hold its own refs to the key and value slices.
+///
+/// Currently used only in the retry code.
 void grpc_metadata_batch_copy(grpc_metadata_batch* src,
                               grpc_metadata_batch* dst,
                               grpc_linked_mdelem* storage);

data/src/ruby/ext/grpc/extconf.rb

@@ -57,7 +57,7 @@ end
 
 ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
 ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\"" '
-ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.40.0.pre1\"" '
+ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.40.0\"" '
 
 output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
 grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.40.0.pre1
+  version: 1.40.0
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2021-08-21 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -2490,55 +2490,55 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.27
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/debug_message_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/testdata/client.key
-- src/ruby/spec/testdata/server1.pem
-- src/ruby/spec/testdata/client.pem
-- src/ruby/spec/testdata/server1.key
-- src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/README
-- src/ruby/spec/pb/codegen/package_option_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
-- src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
-- src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
 - src/ruby/spec/pb/codegen/grpc/testing/same_package_service_name.proto
+- src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto
+- src/ruby/spec/pb/codegen/package_option_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
 - src/ruby/spec/pb/health/checker_spec.rb
-- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/errors_spec.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/support/services.rb
 - src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/testdata/client.key
+- src/ruby/spec/testdata/README
+- src/ruby/spec/testdata/client.pem
+- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/server1.key
 - src/ruby/spec/server_spec.rb
-- src/ruby/spec/call_spec.rb
 - src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/channel_credentials_spec.rb
 - src/ruby/spec/user_agent_spec.rb
-- src/ruby/spec/errors_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/spec_helper.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
 - src/ruby/spec/channel_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/rpc_server_spec.rb
 - src/ruby/spec/generic/server_interceptors_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
 - src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/generic/client_stub_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/rpc_server_pool_spec.rb
+- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/generic/client_interceptors_spec.rb
+- src/ruby/spec/compression_options_spec.rb
+- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/call_credentials_spec.rb
 - src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/call_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/debug_message_spec.rb