[supervisor] Fix subscription leaks in PortsStatus (#20332)

filiptronicek · web-flow · commit 14a1894629f6 · 2024-10-30T17:28:56.000-04:00
* Increase port status subscription limit

* Properly close supervisor status service connections
diff --git a/components/local-app/pkg/bastion/bastion.go b/components/local-app/pkg/bastion/bastion.go
@@ -760,6 +760,9 @@ func (b *Bastion) tunnelPorts(ws *Workspace) {
 }
 
 func (b *Bastion) doTunnelPorts(ctx context.Context, ws *Workspace) error {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
 	statusService := supervisor.NewStatusServiceClient(ws.supervisorClient)
 	status, err := statusService.PortsStatus(ctx, &supervisor.PortsStatusRequest{
 		Observe: true,
diff --git a/components/supervisor/pkg/ports/served-ports.go b/components/supervisor/pkg/ports/served-ports.go
@@ -40,7 +40,7 @@ type ServedPortsObserver interface {
 }
 
 const (
-	maxSubscriptions = 10
+	maxSubscriptions = 100
 
 	fnNetTCP  = "/proc/net/tcp"
 	fnNetTCP6 = "/proc/net/tcp6"

Original file line number	Diff line number	Diff line change
`@@ -760,6 +760,9 @@ func (b Bastion) tunnelPorts(ws Workspace) {`
`760`	`760`	`}`
`761`	`761`
`762`	`762`	`func (b Bastion) doTunnelPorts(ctx context.Context, ws Workspace) error {`
	`763`	`+ ctx, cancel := context.WithCancel(ctx)`
	`764`	`+ defer cancel()`
	`765`	`+`
`763`	`766`	`statusService := supervisor.NewStatusServiceClient(ws.supervisorClient)`
`764`	`767`	`status, err := statusService.PortsStatus(ctx, &supervisor.PortsStatusRequest{`
`765`	`768`	`Observe: true,`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ type ServedPortsObserver interface {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`const (`
`43`		`- maxSubscriptions = 10`
	`43`	`+ maxSubscriptions = 100`
`44`	`44`
`45`	`45`	`fnNetTCP = "/proc/net/tcp"`
`46`	`46`	`fnNetTCP6 = "/proc/net/tcp6"`