cherry-pick: channelz: fix race accessing channelMap without lock (#7079) (#7080)

dfawley · web-flow · commit 88547614e742 · 2024-04-03T11:24:51.000-07:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func RegisterSubChannel(pid int64, ref string) *SubChannel {`
`153`	`153`	`RefName: ref,`
`154`	`154`	`ID: id,`
`155`	`155`	`sockets: make(map[int64]string),`
`156`		`- parent: db.channels[pid],`
	`156`	`+ parent: db.getChannel(pid),`
`157`	`157`	`trace: &ChannelTrace{CreationTime: time.Now(), Events: make([]*traceEvent, 0, getMaxTraceEntry())},`
`158`	`158`	`}`
`159`	`159`	`db.addSubChannel(id, sc, pid)`