Merge branch 'shush-tsan' into shush-e2e

ctiller · Jan 24, 2024 · abe88bb · abe88bb
2 parents 24d914d + a0cc37f
commit abe88bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
@@ -77,8 +77,7 @@ using grpc_event_engine::experimental::EventEngine;
 ChaoticGoodServerListener::ChaoticGoodServerListener(
     Server* server, const ChannelArgs& args,
     absl::AnyInvocable<std::string()> connection_id_generator)
-    : RefCounted<ChaoticGoodServerListener>("ChaoticGoodServerListener"),
-      server_(server),
+    : server_(server),
       args_(args),
       event_engine_(grpc_event_engine::experimental::GetDefaultEventEngine()),
       connection_id_generator_(std::move(connection_id_generator)) {}
@@ -175,8 +174,7 @@ void ChaoticGoodServerListener::ActiveConnection::Fail(
 
 ChaoticGoodServerListener::ActiveConnection::HandshakingState::HandshakingState(
     RefCountedPtr<ActiveConnection> connection)
-    : RefCounted<HandshakingState>("handshaking_state"),
-      memory_allocator_(connection->memory_allocator_),
+    : memory_allocator_(connection->memory_allocator_),
       connection_(std::move(connection)),
       handshake_mgr_(MakeRefCounted<HandshakeManager>()) {}
 

diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc
@@ -288,7 +288,6 @@ size_t GrpcMemoryAllocatorImpl::Reserve(MemoryRequest request) {
     if (reservation.has_value()) {
       size_t new_free = free_bytes_.load(std::memory_order_relaxed);
       memory_quota_->MaybeMoveAllocator(this, old_free, new_free);
-      gpr_log(GPR_INFO, "%p: Reserve(%" PRIuPTR ")", this, *reservation);
       return *reservation;
     }