grpc 1.65.0 → 1.65.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61336feda513285da8764e06e3d85c83ad801afbecec8c71d2d7fd1d80dcde69
-  data.tar.gz: a26e0c5d13589d8f218b4b5f50e72b8c00bce163942714475030e815745bc7e4
+  metadata.gz: 0f7fb00b001baa72da1610e37b806197d5be662256faa1fe7b48a6f7f5c27017
+  data.tar.gz: b36119a3b270a2a66827949490d9e708ac3df7abbbb55dc74e55ea6bc3157f58
 SHA512:
-  metadata.gz: 1109d522211ac31b0c0a713cf9008425320639161243c1b9e452dca00cc825b539a5600dc40770a8810ecc31b31c5b4b5a2b1079f91f3e8eb72ef7d390b8a475
-  data.tar.gz: 52c87db782a5c5cec3c19f6ea9267cf01bcf7dabcccc23fb30beb960dd4d00a3aac74462ebfd373188a1776360503a1dd34ad1665b67afb1a0188895c4cc98f7
+  metadata.gz: 55ff653a9ed98a3d3122ca80187d6a8897e40b998bd0ad6e68007244939a789fb9f11733784018456e312120c75926530936bc897980aa9dde6485fa1da37ed4
+  data.tar.gz: a20230c8357f4909d26c4f92818d4caa276660b8ee6d668b41c58fe835da6fca97ba75f9a1c98e569c62f699c8acbcddf4c50382a38695b5dbc69188ad07dbcd

data/Makefile

@@ -368,7 +368,7 @@ Q = @
 endif
 
 CORE_VERSION = 42.0.0
-CPP_VERSION = 1.65.0
+CPP_VERSION = 1.65.2
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/client_channel/subchannel.cc

@@ -758,8 +758,10 @@ void Subchannel::OnRetryTimer() {
 
 void Subchannel::OnRetryTimerLocked() {
   if (shutdown_) return;
-  gpr_log(GPR_INFO, "subchannel %p %s: backoff delay elapsed, reporting IDLE",
-          this, key_.ToString().c_str());
+  if (GRPC_TRACE_FLAG_ENABLED(subchannel)) {
+    LOG(INFO) << "subchannel " << this << " " << key_.ToString()
+              << ": backoff delay elapsed, reporting IDLE";
+  }
   SetConnectivityStateLocked(GRPC_CHANNEL_IDLE, absl::OkStatus());
 }
 
@@ -803,11 +805,12 @@ void Subchannel::OnConnectingFinishedLocked(grpc_error_handle error) {
   if (connecting_result_.transport == nullptr || !PublishTransportLocked()) {
     const Duration time_until_next_attempt =
         next_attempt_time_ - Timestamp::Now();
-    gpr_log(GPR_INFO,
-            "subchannel %p %s: connect failed (%s), backing off for %" PRId64
-            " ms",
-            this, key_.ToString().c_str(), StatusToString(error).c_str(),
-            time_until_next_attempt.millis());
+    if (GRPC_TRACE_FLAG_ENABLED(subchannel)) {
+      LOG(INFO) << "subchannel " << this << " " << key_.ToString()
+                << ": connect failed (" << StatusToString(error)
+                << "), backing off for " << time_until_next_attempt.millis()
+                << " ms";
+    }
     SetConnectivityStateLocked(GRPC_CHANNEL_TRANSIENT_FAILURE,
                                grpc_error_to_absl_status(error));
     retry_timer_handle_ = event_engine_->RunAfter(

data/src/core/ext/transport/chttp2/client/chttp2_connector.cc

@@ -168,10 +168,12 @@ void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error_handle error) {
           &self->on_receive_settings_, self->args_.interested_parties, nullptr);
       self->timer_handle_ = self->event_engine_->RunAfter(
           self->args_.deadline - Timestamp::Now(),
-          [self = self->RefAsSubclass<Chttp2Connector>()] {
+          [self = self->RefAsSubclass<Chttp2Connector>()]() mutable {
             ApplicationCallbackExecCtx callback_exec_ctx;
             ExecCtx exec_ctx;
             self->OnTimeout();
+            // Ensure the Chttp2Connector is deleted under an ExecCtx.
+            self.reset();
           });
     } else {
       // If the handshaking succeeded but there is no endpoint, then the

data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc

@@ -1735,8 +1735,8 @@ void grpc_chttp2_keepalive_timeout(
     grpc_core::RefCountedPtr<grpc_chttp2_transport> t) {
   t->combiner->Run(
       grpc_core::NewClosure([t](grpc_error_handle) {
-        gpr_log(GPR_INFO, "%s: Keepalive timeout. Closing transport.",
-                std::string(t->peer_string.as_string_view()).c_str());
+        GRPC_TRACE_LOG(http, INFO) << t->peer_string.as_string_view()
+                                   << ": Keepalive timeout. Closing transport.";
         send_goaway(
             t.get(),
             grpc_error_set_int(GRPC_ERROR_CREATE("keepalive_timeout"),
@@ -1756,8 +1756,8 @@ void grpc_chttp2_ping_timeout(
     grpc_core::RefCountedPtr<grpc_chttp2_transport> t) {
   t->combiner->Run(
       grpc_core::NewClosure([t](grpc_error_handle) {
-        gpr_log(GPR_INFO, "%s: Ping timeout. Closing transport.",
-                std::string(t->peer_string.as_string_view()).c_str());
+        GRPC_TRACE_LOG(http, INFO) << t->peer_string.as_string_view()
+                                   << ": Ping timeout. Closing transport.";
         send_goaway(
             t.get(),
             grpc_error_set_int(GRPC_ERROR_CREATE("ping_timeout"),
@@ -1777,8 +1777,8 @@ void grpc_chttp2_settings_timeout(
     grpc_core::RefCountedPtr<grpc_chttp2_transport> t) {
   t->combiner->Run(
       grpc_core::NewClosure([t](grpc_error_handle) {
-        gpr_log(GPR_INFO, "%s: Settings timeout. Closing transport.",
-                std::string(t->peer_string.as_string_view()).c_str());
+        GRPC_TRACE_LOG(http, INFO) << t->peer_string.as_string_view()
+                                   << ": Settings timeout. Closing transport.";
         send_goaway(
             t.get(),
             grpc_error_set_int(GRPC_ERROR_CREATE("settings_timeout"),

data/src/core/ext/transport/inproc/inproc_transport.cc

@@ -70,8 +70,8 @@ class InprocServerTransport final : public ServerTransport {
   void SetPollset(grpc_stream*, grpc_pollset*) override {}
   void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {}
   void PerformOp(grpc_transport_op* op) override {
-    gpr_log(GPR_INFO, "inproc server op: %s",
-            grpc_transport_op_string(op).c_str());
+    GRPC_TRACE_LOG(inproc, INFO)
+        << "inproc server op: " << grpc_transport_op_string(op);
     if (op->start_connectivity_watch != nullptr) {
       MutexLock lock(&state_tracker_mu_);
       state_tracker_.AddWatcher(op->start_connectivity_watch_state,

data/src/core/handshaker/http_connect/http_connect_handshaker.cc

@@ -330,8 +330,8 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/,
   // Log connection via proxy.
   std::string proxy_name(grpc_endpoint_get_peer(args->endpoint));
   std::string server_name_string(*server_name);
-  gpr_log(GPR_INFO, "Connecting to server %s via HTTP proxy %s",
-          server_name_string.c_str(), proxy_name.c_str());
+  VLOG(2) << "Connecting to server " << server_name_string << " via HTTP proxy "
+          << proxy_name;
   // Construct HTTP CONNECT request.
   grpc_http_request request;
   request.method = const_cast<char*>("CONNECT");

data/src/core/handshaker/http_connect/http_proxy_mapper.cc

@@ -220,13 +220,11 @@ absl::optional<std::string> HttpProxyMapper::MapName(
     return absl::nullopt;
   }
   if (uri->scheme() == "unix") {
-    gpr_log(GPR_INFO, "not using proxy for Unix domain socket '%s'",
-            std::string(server_uri).c_str());
+    VLOG(2) << "not using proxy for Unix domain socket '" << server_uri << "'";
     return absl::nullopt;
   }
   if (uri->scheme() == "vsock") {
-    gpr_log(GPR_INFO, "not using proxy for VSock '%s'",
-            std::string(server_uri).c_str());
+    VLOG(2) << "not using proxy for VSock '" << server_uri << "'";
     return absl::nullopt;
   }
   // Prefer using 'no_grpc_proxy'. Fallback on 'no_proxy' if it is not set.
@@ -239,18 +237,17 @@ absl::optional<std::string> HttpProxyMapper::MapName(
     std::string server_port;
     if (!SplitHostPort(absl::StripPrefix(uri->path(), "/"), &server_host,
                        &server_port)) {
-      gpr_log(GPR_INFO,
-              "unable to split host and port, not checking no_proxy list for "
-              "host '%s'",
-              std::string(server_uri).c_str());
+      VLOG(2) << "unable to split host and port, not checking no_proxy list "
+                 "for host '"
+              << server_uri << "'";
     } else {
       auto address = StringToSockaddr(server_host, 0);
       if (AddressIncluded(address.ok()
                               ? absl::optional<grpc_resolved_address>(*address)
                               : absl::nullopt,
                           server_host, *no_proxy_str)) {
-        gpr_log(GPR_INFO, "not using proxy for host in no_proxy list '%s'",
-                std::string(server_uri).c_str());
+        VLOG(2) << "not using proxy for host in no_proxy list '" << server_uri
+                << "'";
         return absl::nullopt;
       }
     }

data/src/core/lib/compression/message_compress.cc

@@ -62,17 +62,17 @@ static int zlib_body(z_stream* zs, grpc_slice_buffer* input,
       }
       r = flate(zs, flush);
       if (r < 0 && r != Z_BUF_ERROR /* not fatal */) {
-        LOG(INFO) << "zlib error (" << r << ")";
+        VLOG(2) << "zlib error (" << r << ")";
         goto error;
       }
     } while (zs->avail_out == 0);
     if (zs->avail_in) {
-      LOG(INFO) << "zlib: not all input consumed";
+      VLOG(2) << "zlib: not all input consumed";
       goto error;
     }
   }
   if (r != Z_STREAM_END) {
-    LOG(INFO) << "zlib: Data error";
+    VLOG(2) << "zlib: Data error";
     goto error;
   }
 

data/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc

@@ -356,7 +356,8 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler)
   wakeup_fd_ = *CreateWakeupFd();
   CHECK(wakeup_fd_ != nullptr);
   CHECK_GE(g_epoll_set_.epfd, 0);
-  LOG(INFO) << "grpc epoll fd: " << g_epoll_set_.epfd;
+  GRPC_TRACE_LOG(event_engine_poller, INFO)
+      << "grpc epoll fd: " << g_epoll_set_.epfd;
   struct epoll_event ev;
   ev.events = static_cast<uint32_t>(EPOLLIN | EPOLLET);
   ev.data.ptr = wakeup_fd_.get();

data/src/core/lib/event_engine/posix_engine/posix_endpoint.cc

@@ -1295,9 +1295,9 @@ PosixEndpointImpl::PosixEndpointImpl(EventHandle* handle,
     }
 
     if (zerocopy_enabled) {
-      LOG(INFO) << "Tx-zero copy enabled for gRPC sends. RLIMIT_MEMLOCK value "
-                << "=" << GetRLimitMemLockMax()
-                << ",ulimit hard memlock value = " << GetUlimitHardMemLock();
+      VLOG(2) << "Tx-zero copy enabled for gRPC sends. RLIMIT_MEMLOCK value "
+              << "=" << GetRLimitMemLockMax()
+              << ",ulimit hard memlock value = " << GetUlimitHardMemLock();
     }
   }
 #endif  // GRPC_LINUX_ERRQUEUE

data/src/core/lib/event_engine/posix_engine/posix_endpoint.h

@@ -184,7 +184,7 @@ class TcpZerocopySendCtx {
     if (send_records_ == nullptr || free_send_records_ == nullptr) {
       gpr_free(send_records_);
       gpr_free(free_send_records_);
-      LOG(INFO) << "Disabling TCP TX zerocopy due to memory pressure.\n";
+      VLOG(2) << "Disabling TCP TX zerocopy due to memory pressure.\n";
       memory_limited_ = true;
       enabled_ = false;
     } else {

data/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc

@@ -345,14 +345,14 @@ absl::StatusOr<int> ListenerContainerAddWildcardAddresses(
   }
   if (assigned_port > 0) {
     if (!v6_sock.ok()) {
-      LOG(INFO) << "Failed to add :: listener, the environment may not support "
-                   "IPv6: "
-                << v6_sock.status();
+      VLOG(2) << "Failed to add :: listener, the environment may not support "
+                 "IPv6: "
+              << v6_sock.status();
     }
     if (!v4_sock.ok()) {
-      LOG(INFO) << "Failed to add 0.0.0.0 listener, "
-                   "the environment may not support IPv4: "
-                << v4_sock.status();
+      VLOG(2) << "Failed to add 0.0.0.0 listener, "
+                 "the environment may not support IPv4: "
+              << v4_sock.status();
     }
     return assigned_port;
   } else {

data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc

@@ -627,12 +627,16 @@ void PosixSocketWrapper::TrySetSocketTcpUserTimeout(
     // if it is available.
     if (g_socket_supports_tcp_user_timeout.load() == 0) {
       if (0 != getsockopt(fd_, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len)) {
-        LOG(INFO) << "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT "
-                     "won't be used thereafter";
+        // This log is intentionally not protected behind a flag, so that users
+        // know that TCP_USER_TIMEOUT is not being used.
+        GRPC_TRACE_LOG(tcp, INFO)
+            << "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT "
+               "won't be used thereafter";
         g_socket_supports_tcp_user_timeout.store(-1);
       } else {
-        LOG(INFO) << "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be "
-                     "used thereafter";
+        GRPC_TRACE_LOG(tcp, INFO)
+            << "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be "
+               "used thereafter";
         g_socket_supports_tcp_user_timeout.store(1);
       }
     }
@@ -681,7 +685,8 @@ bool PosixSocketWrapper::IsIpv6LoopbackAvailable() {
     int fd = socket(AF_INET6, SOCK_STREAM, 0);
     bool loopback_available = false;
     if (fd < 0) {
-      LOG(INFO) << "Disabling AF_INET6 sockets because socket() failed.";
+      GRPC_TRACE_LOG(tcp, INFO)
+          << "Disabling AF_INET6 sockets because socket() failed.";
     } else {
       sockaddr_in6 addr;
       memset(&addr, 0, sizeof(addr));
@@ -690,7 +695,8 @@ bool PosixSocketWrapper::IsIpv6LoopbackAvailable() {
       if (bind(fd, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) == 0) {
         loopback_available = true;
       } else {
-        LOG(INFO) << "Disabling AF_INET6 sockets because ::1 is not available.";
+        GRPC_TRACE_LOG(tcp, INFO)
+            << "Disabling AF_INET6 sockets because ::1 is not available.";
       }
       close(fd);
     }

data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc

@@ -36,6 +36,7 @@
 #include <grpc/support/thd_id.h>
 
 #include "src/core/lib/backoff/backoff.h"
+#include "src/core/lib/debug/trace_impl.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_local.h"
 #include "src/core/lib/event_engine/trace.h"
@@ -266,7 +267,6 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::StartThread() {
 }
 
 void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Quiesce() {
-  LOG(INFO) << "WorkStealingThreadPoolImpl::Quiesce";
   SetShutdown(true);
   // Wait until all threads have exited.
   // Note that if this is a threadpool thread then we won't exit this thread
@@ -318,7 +318,8 @@ bool WorkStealingThreadPool::WorkStealingThreadPoolImpl::IsQuiesced() {
 }
 
 void WorkStealingThreadPool::WorkStealingThreadPoolImpl::PrepareFork() {
-  LOG(INFO) << "WorkStealingThreadPoolImpl::PrepareFork";
+  LOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(event_engine))
+      << "WorkStealingThreadPoolImpl::PrepareFork";
   SetForking(true);
   work_signal_.SignalAll();
   auto threads_were_shut_down = living_thread_count_.BlockUntilThreadCount(

data/src/core/lib/event_engine/windows/win_socket.cc

@@ -71,7 +71,8 @@ void WinSocket::Shutdown() {
                         &ioctl_num_bytes, NULL, NULL);
   if (status != 0) {
     char* utf8_message = gpr_format_message(WSAGetLastError());
-    LOG(INFO) << "Unable to retrieve DisconnectEx pointer : " << utf8_message;
+    GRPC_TRACE_LOG(event_engine_endpoint, INFO)
+        << "Unable to retrieve DisconnectEx pointer : " << utf8_message;
     gpr_free(utf8_message);
   } else if (DisconnectEx(socket_, NULL, 0, 0) == FALSE) {
     auto last_error = WSAGetLastError();
@@ -79,7 +80,8 @@ void WinSocket::Shutdown() {
     // error, and log all others.
     if (last_error != WSAENOTCONN) {
       char* utf8_message = gpr_format_message(last_error);
-      LOG(INFO) << "DisconnectEx failed: " << utf8_message;
+      GRPC_TRACE_LOG(event_engine_endpoint, INFO)
+          << "DisconnectEx failed: " << utf8_message;
       gpr_free(utf8_message);
     }
   }

data/src/core/lib/event_engine/windows/windows_endpoint.cc

@@ -42,8 +42,8 @@ constexpr int kMaxWSABUFCount = 16;
 void DumpSliceBuffer(SliceBuffer* buffer, absl::string_view context_string) {
   for (size_t i = 0; i < buffer->Count(); i++) {
     auto str = buffer->MutableSliceAt(i).as_string_view();
-    gpr_log(GPR_INFO, "%s: %.*s", context_string.data(), str.length(),
-            str.data());
+    GRPC_TRACE_LOG(event_engine_endpoint, INFO)
+        << context_string << ": " << str;
   }
 }
 
@@ -159,8 +159,9 @@ bool WindowsEndpoint::Write(absl::AnyInvocable<void(absl::Status)> on_writable,
   if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint_data)) {
     for (size_t i = 0; i < data->Count(); i++) {
       auto str = data->RefSlice(i).as_string_view();
-      gpr_log(GPR_INFO, "WindowsEndpoint::%p WRITE (peer=%s): %.*s", this,
-              peer_address_string_.c_str(), str.length(), str.data());
+      GRPC_TRACE_LOG(event_engine_endpoint, INFO)
+          << "WindowsEndpoint::" << this
+          << " WRITE (peer=" << peer_address_string_ << "): " << str;
     }
   }
   CHECK(data->Count() <= UINT_MAX);

data/src/core/lib/experiments/config.cc

@@ -24,6 +24,7 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
@@ -227,19 +228,20 @@ void PrintExperimentsList() {
   }
   if (experiment_status.empty()) {
     if (!defaulted_on_experiments.empty()) {
-      gpr_log(GPR_INFO, "gRPC experiments enabled: %s",
-              absl::StrJoin(defaulted_on_experiments, ", ").c_str());
+      VLOG(2) << "gRPC experiments enabled: "
+              << absl::StrJoin(defaulted_on_experiments, ", ");
     }
   } else {
     if (defaulted_on_experiments.empty()) {
-      gpr_log(GPR_INFO, "gRPC experiments: %s",
-              absl::StrJoin(experiment_status, ", ", absl::PairFormatter(":"))
-                  .c_str());
+      VLOG(2) << "gRPC experiments: "
+              << absl::StrJoin(experiment_status, ", ",
+                               absl::PairFormatter(":"));
     } else {
-      gpr_log(GPR_INFO, "gRPC experiments: %s; default-enabled: %s",
-              absl::StrJoin(experiment_status, ", ", absl::PairFormatter(":"))
-                  .c_str(),
-              absl::StrJoin(defaulted_on_experiments, ", ").c_str());
+      VLOG(2) << "gRPC experiments: "
+              << absl::StrJoin(experiment_status, ", ",
+                               absl::PairFormatter(":"))
+              << "; default-enabled: "
+              << absl::StrJoin(defaulted_on_experiments, ", ");
     }
   }
 }

data/src/core/lib/experiments/experiments.cc

@@ -501,7 +501,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
      true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
-     additional_constraints_work_serializer_dispatch, nullptr, 0, true, true},
+     additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
 };
 
 }  // namespace grpc_core

data/src/core/lib/experiments/experiments.h

@@ -158,8 +158,7 @@ inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
-inline bool IsWorkSerializerDispatchEnabled() { return true; }
+inline bool IsWorkSerializerDispatchEnabled() { return false; }
 #endif
 
 #else

data/src/core/lib/gprpp/dual_ref_counted.h

@@ -93,9 +93,9 @@ class DualRefCounted : public Impl {
 #ifndef NDEBUG
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     if (trace_ != nullptr) {
-      LOG(INFO) << trace_ << ":" << this << " unref " << strong_refs << " -> "
-                << strong_refs - 1 << ", weak_ref " << weak_refs << " -> "
-                << weak_refs + 1;
+      VLOG(2) << trace_ << ":" << this << " unref " << strong_refs << " -> "
+              << strong_refs - 1 << ", weak_ref " << weak_refs << " -> "
+              << weak_refs + 1;
     }
     CHECK_GT(strong_refs, 0u);
 #endif
@@ -112,10 +112,10 @@ class DualRefCounted : public Impl {
 #ifndef NDEBUG
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     if (trace_ != nullptr) {
-      LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":"
-                << location.line() << " unref " << strong_refs << " -> "
-                << strong_refs - 1 << ", weak_ref " << weak_refs << " -> "
-                << weak_refs + 1 << ") " << reason;
+      VLOG(2) << trace_ << ":" << this << " " << location.file() << ":"
+              << location.line() << " unref " << strong_refs << " -> "
+              << strong_refs - 1 << ", weak_ref " << weak_refs << " -> "
+              << weak_refs + 1 << ") " << reason;
     }
     CHECK_GT(strong_refs, 0u);
 #else
@@ -137,9 +137,9 @@ class DualRefCounted : public Impl {
 #ifndef NDEBUG
       const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
       if (trace_ != nullptr) {
-        LOG(INFO) << trace_ << ":" << this << " ref_if_non_zero " << strong_refs
-                  << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs
-                  << ")";
+        VLOG(2) << trace_ << ":" << this << " ref_if_non_zero " << strong_refs
+                << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs
+                << ")";
       }
 #endif
       if (strong_refs == 0) return nullptr;
@@ -156,10 +156,10 @@ class DualRefCounted : public Impl {
 #ifndef NDEBUG
       const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
       if (trace_ != nullptr) {
-        LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":"
-                  << location.line() << " ref_if_non_zero " << strong_refs
-                  << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs
-                  << ") " << reason;
+        VLOG(2) << trace_ << ":" << this << " " << location.file() << ":"
+                << location.line() << " ref_if_non_zero " << strong_refs
+                << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs
+                << ") " << reason;
       }
 #else
       // Avoid unused-parameter warnings for debug-only parameters
@@ -214,8 +214,8 @@ class DualRefCounted : public Impl {
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     const uint32_t strong_refs = GetStrongRefs(prev_ref_pair);
     if (trace != nullptr) {
-      LOG(INFO) << trace << ":" << this << " weak_unref " << weak_refs << " -> "
-                << weak_refs - 1 << " (refs=" << strong_refs << ")";
+      VLOG(2) << trace << ":" << this << " weak_unref " << weak_refs << " -> "
+              << weak_refs - 1 << " (refs=" << strong_refs << ")";
     }
     CHECK_GT(weak_refs, 0u);
 #endif
@@ -236,9 +236,9 @@ class DualRefCounted : public Impl {
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     const uint32_t strong_refs = GetStrongRefs(prev_ref_pair);
     if (trace != nullptr) {
-      LOG(INFO) << trace << ":" << this << " " << location.file() << ":"
-                << location.line() << " weak_unref " << weak_refs << " -> "
-                << weak_refs - 1 << " (refs=" << strong_refs << ") " << reason;
+      VLOG(2) << trace << ":" << this << " " << location.file() << ":"
+              << location.line() << " weak_unref " << weak_refs << " -> "
+              << weak_refs - 1 << " (refs=" << strong_refs << ") " << reason;
     }
     CHECK_GT(weak_refs, 0u);
 #else
@@ -301,8 +301,8 @@ class DualRefCounted : public Impl {
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     CHECK_NE(strong_refs, 0u);
     if (trace_ != nullptr) {
-      LOG(INFO) << trace_ << ":" << this << " ref " << strong_refs << " -> "
-                << strong_refs + 1 << "; (weak_refs=" << weak_refs << ")";
+      VLOG(2) << trace_ << ":" << this << " ref " << strong_refs << " -> "
+              << strong_refs + 1 << "; (weak_refs=" << weak_refs << ")";
     }
 #else
     refs_.fetch_add(MakeRefPair(1, 0), std::memory_order_relaxed);
@@ -316,10 +316,10 @@ class DualRefCounted : public Impl {
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     CHECK_NE(strong_refs, 0u);
     if (trace_ != nullptr) {
-      LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":"
-                << location.line() << " ref " << strong_refs << " -> "
-                << strong_refs + 1 << " (weak_refs=" << weak_refs << ") "
-                << reason;
+      VLOG(2) << trace_ << ":" << this << " " << location.file() << ":"
+              << location.line() << " ref " << strong_refs << " -> "
+              << strong_refs + 1 << " (weak_refs=" << weak_refs << ") "
+              << reason;
     }
 #else
     // Use conditionally-important parameters
@@ -336,8 +336,8 @@ class DualRefCounted : public Impl {
     const uint32_t strong_refs = GetStrongRefs(prev_ref_pair);
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     if (trace_ != nullptr) {
-      LOG(INFO) << trace_ << ":" << this << " weak_ref " << weak_refs << " -> "
-                << weak_refs + 1 << "; (refs=" << strong_refs << ")";
+      VLOG(2) << trace_ << ":" << this << " weak_ref " << weak_refs << " -> "
+              << weak_refs + 1 << "; (refs=" << strong_refs << ")";
     }
     if (strong_refs == 0) CHECK_NE(weak_refs, 0u);
 #else
@@ -352,9 +352,9 @@ class DualRefCounted : public Impl {
     const uint32_t strong_refs = GetStrongRefs(prev_ref_pair);
     const uint32_t weak_refs = GetWeakRefs(prev_ref_pair);
     if (trace_ != nullptr) {
-      LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":"
-                << location.line() << " weak_ref " << weak_refs << " -> "
-                << weak_refs + 1 << " (refs=" << strong_refs << ") " << reason;
+      VLOG(2) << trace_ << ":" << this << " " << location.file() << ":"
+              << location.line() << " weak_ref " << weak_refs << " -> "
+              << weak_refs + 1 << " (refs=" << strong_refs << ") " << reason;
     }
     if (strong_refs == 0) CHECK_NE(weak_refs, 0u);
 #else

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

@@ -66,13 +66,13 @@ static void create_sockets(SOCKET sv[2]) {
   closesocket(lst_sock);
   grpc_error_handle error = grpc_tcp_prepare_socket(cli_sock);
   if (!error.ok()) {
-    LOG(INFO) << "Prepare cli_sock failed with error: "
-              << grpc_core::StatusToString(error);
+    VLOG(2) << "Prepare cli_sock failed with error: "
+            << grpc_core::StatusToString(error);
   }
   error = grpc_tcp_prepare_socket(svr_sock);
   if (!error.ok()) {
-    LOG(INFO) << "Prepare svr_sock failed with error: "
-              << grpc_core::StatusToString(error);
+    VLOG(2) << "Prepare svr_sock failed with error: "
+            << grpc_core::StatusToString(error);
   }
 
   sv[1] = cli_sock;

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

@@ -122,7 +122,7 @@ static bool epoll_set_init() {
     return false;
   }
 
-  gpr_log(GPR_INFO, "grpc epoll fd: %d", g_epoll_set.epfd);
+  GRPC_TRACE_LOG(polling, INFO) << "grpc epoll fd: " << g_epoll_set.epfd;
   gpr_atm_no_barrier_store(&g_epoll_set.num_events, 0);
   gpr_atm_no_barrier_store(&g_epoll_set.cursor, 0);
   return true;