opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tailnet): track agent names for http debug (#8744)

Browse Source
This commit is contained in:
Colin Adler
2023-07-26 18:44:10 +00:00
committed by GitHub
parent b5dec61cd5
commit 6b92abebb9
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enterprise/tailnet/coordinator.go
+2 -2
View File
@@ -158,7 +158,7 @@ func (c *haCoordinator) ServeClient(conn net.Conn, id, agentID uuid.UUID) error
defer cancel()
logger := c.clientLogger(id, agentID)
tc := agpl.NewTrackedConn(ctx, cancel, conn, id, logger, 0)
tc := agpl.NewTrackedConn(ctx, cancel, conn, id, logger, id.String(), 0)
defer tc.Close()
c.addClient(id, tc)
@@ -301,7 +301,7 @@ func (c *haCoordinator) ServeAgent(conn net.Conn, id uuid.UUID, name string) err
}
// This uniquely identifies a connection that belongs to this goroutine.
unique := uuid.New()
tc := agpl.NewTrackedConn(ctx, cancel, conn, unique, logger, overwrites)
tc := agpl.NewTrackedConn(ctx, cancel, conn, unique, logger, name, overwrites)
// Publish all nodes on this instance that want to connect to this agent.
nodes := c.nodesSubscribedToAgent(id)
enterprise/tailnet/pgcoord.go
+15 -11
View File
@@ -131,12 +131,6 @@ func (c *pgCoord) ServeMultiAgent(id uuid.UUID) agpl.MultiAgentConn {
panic("not implemented") // TODO: Implement
}
func (*pgCoord) ServeHTTPDebug(w http.ResponseWriter, _ *http.Request) {
// TODO(spikecurtis) I'd like to hold off implementing this until after the rest of this is code reviewed.
w.WriteHeader(http.StatusOK)
_, _ = w.Write([]byte("Coder Enterprise PostgreSQL distributed tailnet coordinator"))
}
func (c *pgCoord) Node(id uuid.UUID) *agpl.Node {
// In production, we only ever get this request for an agent.
// We're going to directly query the database, since we would only have the agent mapping stored locally if we had
@@ -167,7 +161,7 @@ func (c *pgCoord) ServeClient(conn net.Conn, id uuid.UUID, agent uuid.UUID) erro
slog.Error(err))
}
}()
cIO := newConnIO(c.ctx, c.logger, c.bindings, conn, id, agent)
cIO := newConnIO(c.ctx, c.logger, c.bindings, conn, id, agent, id.String())
if err := sendCtx(c.ctx, c.newConnections, cIO); err != nil {
// can only be a context error, no need to log here.
return err
@@ -186,7 +180,7 @@ func (c *pgCoord) ServeAgent(conn net.Conn, id uuid.UUID, name string) error {
}
}()
logger := c.logger.With(slog.F("name", name))
cIO := newConnIO(c.ctx, logger, c.bindings, conn, uuid.Nil, id)
cIO := newConnIO(c.ctx, logger, c.bindings, conn, uuid.Nil, id, name)
if err := sendCtx(c.ctx, c.newConnections, cIO); err != nil {
// can only be a context error, no need to log here.
return err
@@ -217,8 +211,12 @@ type connIO struct {
bindings chan<- binding
}
func newConnIO(
pCtx context.Context, logger slog.Logger, bindings chan<- binding, conn net.Conn, client, agent uuid.UUID,
func newConnIO(pCtx context.Context,
logger slog.Logger,
bindings chan<- binding,
conn net.Conn,
client, agent uuid.UUID,
name string,
) *connIO {
ctx, cancel := context.WithCancel(pCtx)
id := agent
@@ -235,7 +233,7 @@ func newConnIO(
client: client,
agent: agent,
decoder: json.NewDecoder(conn),
updates: agpl.NewTrackedConn(ctx, cancel, conn, id, logger, 0),
updates: agpl.NewTrackedConn(ctx, cancel, conn, id, logger, name, 0),
bindings: bindings,
}
go c.recvLoop()
@@ -1291,3 +1289,9 @@ func (h *heartbeats) cleanup() {
}
h.logger.Debug(h.ctx, "cleaned up old coordinators")
}
func (*pgCoord) ServeHTTPDebug(w http.ResponseWriter, _ *http.Request) {
// TODO(spikecurtis) I'd like to hold off implementing this until after the rest of this is code reviewed.
w.WriteHeader(http.StatusOK)
_, _ = w.Write([]byte("Coder Enterprise PostgreSQL distributed tailnet coordinator"))
}