From 88547614e7427f7ce87a5f5485d897ae09044641 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Wed, 3 Apr 2024 11:24:51 -0700 Subject: [PATCH] cherry-pick: channelz: fix race accessing channelMap without lock (#7079) (#7080) --- internal/channelz/funcs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/channelz/funcs.go b/internal/channelz/funcs.go index bdefe93cd68e..f461e9bc3baf 100644 --- a/internal/channelz/funcs.go +++ b/internal/channelz/funcs.go @@ -153,7 +153,7 @@ func RegisterSubChannel(pid int64, ref string) *SubChannel { RefName: ref, ID: id, sockets: make(map[int64]string), - parent: db.channels[pid], + parent: db.getChannel(pid), trace: &ChannelTrace{CreationTime: time.Now(), Events: make([]*traceEvent, 0, getMaxTraceEntry())}, } db.addSubChannel(id, sc, pid)