proxy sandbox removal with strictly exact ip

Author: sitole

packages/orchestrator/internal/proxy/proxy.go

@@ -15,6 +15,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -28,6 +29,7 @@ var browserIdentityKeywords = []string{
 type SandboxProxy struct {
 	sandboxes *smap.Map[string]
 	server    *http.Server
+	mu        sync.Mutex
 }
 
 func New(port uint) *SandboxProxy {
@@ -40,11 +42,17 @@ func New(port uint) *SandboxProxy {
 }
 
 func (p *SandboxProxy) AddSandbox(sandboxID, ip string) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
 	p.sandboxes.Insert(sandboxID, ip)
 }
 
-func (p *SandboxProxy) RemoveSandbox(sandboxID string) {
-	p.sandboxes.Remove(sandboxID)
+func (p *SandboxProxy) RemoveSandbox(sandboxID string, ip string) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	p.sandboxes.RemoveCb(sandboxID, func(k string, v string, ok bool) bool { return v == ip })
 }
 
 func (p *SandboxProxy) Start() error {

packages/orchestrator/internal/sandbox/sandbox_linux.go

@@ -322,7 +322,7 @@ func NewSandbox(
 
 	cleanup.Add(func() error {
 		dns.Remove(config.SandboxId, ips.HostIP())
-		proxy.RemoveSandbox(config.SandboxId)
+		proxy.RemoveSandbox(config.SandboxId, ips.HostIP())
 
 		return nil
 	})

packages/orchestrator/internal/server/sandboxes.go

@@ -183,7 +183,7 @@ func (s *server) Delete(ctxConn context.Context, in *orchestrator.SandboxDeleteR
 
 	// Don't allow connecting to the sandbox anymore.
 	s.dns.Remove(in.SandboxId, sbx.Slot.HostIP())
-	s.proxy.RemoveSandbox(in.SandboxId)
+	s.proxy.RemoveSandbox(in.SandboxId, sbx.Slot.HostIP())
 
 	// Remove the sandbox from the cache to prevent loading it again in API during the time the instance is stopping.
 	// Old comment: