grpc 1.81.0 → 1.81.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a47814a22ffe57ebcc187d2e2346be34783977c8006ac1efd1f93ee9a352de47
-  data.tar.gz: c973f22f9fd1d4b0fefa3281df6ad757f1d79e5f6d6029aead67c4e8ecc74638
+  metadata.gz: a3d58a5e67d6cf05b54114dfb7095355290f69a459391657279caa301d555307
+  data.tar.gz: eeb373b6a4246f149c24631ace8bfc1e78c7a666774982b8f7556abaeb15b0f2
 SHA512:
-  metadata.gz: 9238909d32166d31bd42edb85ac7a033e551db7f2bbb1257c8b03801be194507361c6bd57320f2798fbf9b85cce2fa9d444dd84aee296802471252a25401fc39
-  data.tar.gz: 202924299f2c872fc580fca1b405e691649871c9e8c7d8302e48ce9040efffdffa2d4e9010a13db99026da931ffd164647182aa029039e979c705136520b68ca
+  metadata.gz: ab1c195595f71ef70b138dcc6e414f2875d07b909cd9e53af25e26239032c7b04a62e9c22e9cc47766c818d003fe05233f92dca8b9697c65002b5c70c860252a
+  data.tar.gz: de0b49f50de44bd93ced0a5277ecf183314613663ea96c3cd44fed086666c71d68aa7587954412e202bca101798e8e34ffd9c69a9132adfbce154d42943518f8

data/Makefile

@@ -368,7 +368,7 @@ Q = @
 endif
 
 CORE_VERSION = 54.0.0
-CPP_VERSION = 1.81.0
+CPP_VERSION = 1.81.1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/xds/grpc/xds_client_grpc.cc

@@ -191,6 +191,7 @@ const grpc_channel_args* g_channel_args ABSL_GUARDED_BY(*g_mu) = nullptr;
 // Key bytes live in clients so they outlive the entries in this map
 NoDestruct<std::map<absl::string_view, GrpcXdsClient*>> g_xds_client_map
     ABSL_GUARDED_BY(*g_mu);
+bool g_inhibit_map_removal ABSL_GUARDED_BY(*g_mu) = false;
 char* g_fallback_bootstrap_config ABSL_GUARDED_BY(*g_mu) = nullptr;
 NoDestruct<std::shared_ptr<GrpcXdsBootstrap>> g_parsed_bootstrap
     ABSL_GUARDED_BY(*g_mu);
@@ -296,6 +297,10 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
     if (xds_client != nullptr) {
       return xds_client.TakeAsSubclass<GrpcXdsClient>();
     }
+    // Ref count was 0.  Remove the entry so that when we call emplace()
+    // below, we add a new entry, thus ensuring the lifetime of the map
+    // key is correct (since it points into the XdsClient instance).
+    g_xds_client_map->erase(it);
   }
   // The XdsClient doesn't exist, so we'll create it.
   std::shared_ptr<GrpcXdsBootstrap> bootstrap = std::move(bootstrap_override);
@@ -313,7 +318,9 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
                                               certificate_provider_store),
       certificate_provider_store,
       GetStatsPluginGroupForKeyAndChannelArgs(key, args));
-  g_xds_client_map->insert_or_assign(xds_client->key(), xds_client.get());
+  auto [_, inserted] =
+      g_xds_client_map->emplace(xds_client->key(), xds_client.get());
+  GRPC_CHECK(inserted) << "Key: " << key;
   GRPC_TRACE_LOG(xds_client, INFO) << "[xds_client " << xds_client.get()
                                    << "] Created xDS client for key " << key;
   return xds_client;
@@ -368,6 +375,7 @@ void GrpcXdsClient::Orphaned() {
   XdsClient::Orphaned();
   lrs_client_.reset();
   MutexLock lock(g_mu);
+  if (g_inhibit_map_removal) return;
   auto it = g_xds_client_map->find(key_);
   if (it != g_xds_client_map->end() && it->second == this) {
     g_xds_client_map->erase(it);
@@ -452,6 +460,11 @@ void SetXdsChannelArgsForTest(grpc_channel_args* args) {
   g_channel_args = args;
 }
 
+void SetInhibitXdsClientMapRemovalForTest(bool inhibit) {
+  MutexLock lock(g_mu);
+  g_inhibit_map_removal = inhibit;
+}
+
 void UnsetGlobalXdsClientsForTest() {
   MutexLock lock(g_mu);
   g_xds_client_map->clear();

data/src/core/xds/grpc/xds_client_grpc.h

@@ -112,6 +112,7 @@ class GrpcXdsClient final : public XdsClient {
 
 namespace internal {
 void SetXdsChannelArgsForTest(grpc_channel_args* args);
+void SetInhibitXdsClientMapRemovalForTest(bool inhibit);
 void UnsetGlobalXdsClientsForTest();
 // Sets bootstrap config to be used when no env var is set.
 // Does not take ownership of config.

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.81.0
+  version: 1.81.1
 platform: ruby
 authors:
 - gRPC Authors
@@ -3960,7 +3960,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.13
 specification_version: 4
 summary: GRPC system in Ruby
 test_files: