Skip to content

Commit ef8a71c

Browse files
authored
[grpc_trace] protect some log statements behind trace flags (#36956) (#37129)
Backport #36956 to 1.65
1 parent cc02070 commit ef8a71c

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler)
356356
wakeup_fd_ = *CreateWakeupFd();
357357
CHECK(wakeup_fd_ != nullptr);
358358
CHECK_GE(g_epoll_set_.epfd, 0);
359-
LOG(INFO) << "grpc epoll fd: " << g_epoll_set_.epfd;
359+
GRPC_TRACE_LOG(event_engine_poller, INFO)
360+
<< "grpc epoll fd: " << g_epoll_set_.epfd;
360361
struct epoll_event ev;
361362
ev.events = static_cast<uint32_t>(EPOLLIN | EPOLLET);
362363
ev.data.ptr = wakeup_fd_.get();

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,15 @@ void PosixSocketWrapper::TrySetSocketTcpUserTimeout(
627627
// if it is available.
628628
if (g_socket_supports_tcp_user_timeout.load() == 0) {
629629
if (0 != getsockopt(fd_, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len)) {
630+
// This log is intentionally not protected behind a flag, so that users
631+
// know that TCP_USER_TIMEOUT is not being used.
630632
LOG(INFO) << "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT "
631633
"won't be used thereafter";
632634
g_socket_supports_tcp_user_timeout.store(-1);
633635
} else {
634-
LOG(INFO) << "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be "
635-
"used thereafter";
636+
GRPC_TRACE_LOG(tcp, INFO)
637+
<< "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be "
638+
"used thereafter";
636639
g_socket_supports_tcp_user_timeout.store(1);
637640
}
638641
}

src/core/lib/iomgr/ev_epoll1_linux.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static bool epoll_set_init() {
122122
return false;
123123
}
124124

125-
gpr_log(GPR_INFO, "grpc epoll fd: %d", g_epoll_set.epfd);
125+
GRPC_TRACE_LOG(polling, INFO) << "grpc epoll fd: " << g_epoll_set.epfd;
126126
gpr_atm_no_barrier_store(&g_epoll_set.num_events, 0);
127127
gpr_atm_no_barrier_store(&g_epoll_set.cursor, 0);
128128
return true;

0 commit comments

Comments
 (0)