Skip to content

chore: replace wsconncache with a single tailnet #8176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Jul 12, 2023
Merged

chore: replace wsconncache with a single tailnet #8176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7222135
chore: replace wsconncache with a single tailnet
coadler Jun 26, 2023
d4181b0
remove duplicate AwaitReachable
coadler Jun 26, 2023
2a133d1
properly release net.Conn
coadler Jun 26, 2023
aa6bcb6
tailnetTransport
coadler Jun 26, 2023
f9040fc
link to issue in deprecation notice
coadler Jun 26, 2023
a988fef
address review comments
coadler Jun 28, 2023
2e201dc
fixup! address review comments
coadler Jun 28, 2023
5901f68
Merge branch 'main' into colin/rm-wsconncache2
coadler Jun 28, 2023
311ea2b
second round
coadler Jun 28, 2023
30aefcb
fixup! second round
coadler Jun 28, 2023
e55e146
support swapping coordinators
coadler Jun 29, 2023
457470d
use multiagents for all clients
coadler Jun 29, 2023
2c32434
Merge branch 'main' into colin/rm-wsconncache2
coadler Jun 29, 2023
11f2805
fixups
coadler Jun 30, 2023
a88be66
fixup! fixups
coadler Jun 30, 2023
49a8364
Merge branch 'main' into colin/rm-wsconncache2
coadler Jun 30, 2023
5e4b631
fixes
coadler Jun 30, 2023
8ef2fb7
Merge branch 'main' into colin/rm-wsconncache2
coadler Jun 30, 2023
9864d89
Merge branch 'main' into colin/rm-wsconncache2
coadler Jul 7, 2023
dd3cc15
comment
coadler Jul 7, 2023
8896ae4
fixup! comment
coadler Jul 7, 2023
be4db71
fixup! comment
coadler Jul 7, 2023
7bfac9b
add feature flag
coadler Jul 11, 2023
10d44fe
Merge branch 'main' into colin/rm-wsconncache2
coadler Jul 11, 2023
ef44092
fixes
coadler Jul 12, 2023
9a29d85
Merge branch 'main' into colin/rm-wsconncache2
coadler Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
properly release net.Conn
  • Loading branch information
@coadler
coadler committed Jun 26, 2023
commit 2a133d1b7cb927d855b58ec5fb7ca9841f41f39b
26 changes: 20 additions & 6 deletions coderd/tailnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (s *ServerTailnet) updateNode(id uuid.UUID, node *tailnet.Node) {
}
}

func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID uuid.UUID) (*httputil.ReverseProxy, func(), error) {
func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID uuid.UUID) (_ *httputil.ReverseProxy, release func(), _ error) {
proxy := httputil.NewSingleHostReverseProxy(targetURL)
proxy.ErrorHandler = func(w http.ResponseWriter, r *http.Request, err error) {
site.RenderStaticErrorPage(w, r, site.ErrorPageData{
Expand Down Expand Up @@ -257,7 +257,7 @@ func (*ServerTailnet) nodeIsLegacy(node *tailnet.Node) bool {
return node.Addresses[0].Addr() == codersdk.WorkspaceAgentIP
}

func (s *ServerTailnet) AgentConn(ctx context.Context, agentID uuid.UUID) (*codersdk.WorkspaceAgentConn, func(), error) {
func (s *ServerTailnet) AgentConn(ctx context.Context, agentID uuid.UUID) (_ *codersdk.WorkspaceAgentConn, release func(), _ error) {
node, err := s.awaitNodeExists(ctx, agentID, 5*time.Second)
if err != nil {
return nil, nil, xerrors.Errorf("get agent node: %w", err)
Expand Down Expand Up @@ -297,8 +297,6 @@ func (s *ServerTailnet) DialAgentNetConn(ctx context.Context, agentID uuid.UUID,
if err != nil {
return nil, xerrors.Errorf("acquire agent conn: %w", err)
}
defer release()
defer conn.Close()

node, err := s.getNode(agentID)
if err != nil {
Expand All @@ -309,13 +307,29 @@ func (s *ServerTailnet) DialAgentNetConn(ctx context.Context, agentID uuid.UUID,
port, _ := strconv.ParseUint(rawPort, 10, 16)
ipp := netip.AddrPortFrom(node.Addresses[0].Addr(), uint16(port))

var nc net.Conn
if network == "tcp" {
return conn.DialContextTCP(ctx, ipp)
nc, err = conn.DialContextTCP(ctx, ipp)
} else if network == "udp" {
return conn.DialContextUDP(ctx, ipp)
nc, err = conn.DialContextUDP(ctx, ipp)
} else {
return nil, xerrors.Errorf("unknown network %q", network)
}

return &netConnCloser{Conn: nc, close: func() {
release()
conn.Close()
}}, err
}

type netConnCloser struct {
net.Conn
close func()
}

func (c *netConnCloser) Close() error {
c.close()
return c.Conn.Close()
}

func (s *ServerTailnet) Close() error {
Expand Down
11 changes: 9 additions & 2 deletions coderd/workspaceapps/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,18 @@ var nonCanonicalHeaders = map[string]string{
}

type AgentProvider interface {
// ReverseProxy returns an httputil.ReverseProxy for proxying HTTP requests
// to the specified agent.
//
// TODO: after wsconncache is deleted this doesn't need to return an error.
ReverseProxy(targetURL, dashboardURL *url.URL, agentID uuid.UUID) (_ *httputil.ReverseProxy, release func(), _ error)

// AgentConn returns a new connection to the specified agent.
//
// TODO: after wsconncache is deleted this doesn't need to return a release
// func.
AgentConn(ctx context.Context, agentID uuid.UUID) (_ *codersdk.WorkspaceAgentConn, release func(), _ error)
// TODO: after wsconncache is deleted this doesn't need to return an error.
ReverseProxy(targetURL, dashboardURL *url.URL, agentID uuid.UUID) (_ *httputil.ReverseProxy, release func(), _ error)

Close() error
}

Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ require (
github.com/docker/docker v23.0.3+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1
github.com/elastic/go-windows v1.0.0 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
Expand Down
1 change: 0 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/elastic/go-sysinfo v1.11.0 h1:QW+6BF1oxBoAprH3w2yephF7xLkrrSXj7gl2xC2BM4w=
github.com/elastic/go-sysinfo v1.11.0/go.mod h1:6KQb31j0QeWBDF88jIdWSxE8cwoOB9tO4Y4osN7Q70E=
github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY=
Expand Down