fixup! fix(enterprise/tailnet): handle query canceled error in sendBeat()

johnstcn · johnstcn · commit b813b2a2ae7b · 2024-01-24T13:00:56.000Z
diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go
@@ -1494,7 +1494,7 @@ func (h *heartbeats) sendBeats() {
 
 func (h *heartbeats) sendBeat() {
 	_, err := h.store.UpsertTailnetCoordinator(h.ctx, h.self)
-	if xerrors.Is(err, context.Canceled) || database.IsQueryCanceledError(err) {
+	if database.IsQueryCanceledError(err) {
 		return
 	}
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1494,7 +1494,7 @@ func (h *heartbeats) sendBeats() {`
`1494`	`1494`
`1495`	`1495`	`func (h *heartbeats) sendBeat() {`
`1496`	`1496`	`_, err := h.store.UpsertTailnetCoordinator(h.ctx, h.self)`
`1497`		`- if xerrors.Is(err, context.Canceled) \|\| database.IsQueryCanceledError(err) {`
	`1497`	`+ if database.IsQueryCanceledError(err) {`
`1498`	`1498`	`return`
`1499`	`1499`	`}`
`1500`	`1500`	`if err != nil {`