Defer cancel on timeout for heartbeat

anna-tran · anna-tran · commit c6a3ca9e961d · 2024-09-17T14:56:01.000-07:00
Signed-off-by: Anna Tran &lt;trananna@amazon.com&gt;
diff --git a/pkg/ring/lifecycler.go b/pkg/ring/lifecycler.go
@@ -543,8 +543,9 @@ func (i *Lifecycler) loop(ctx context.Context) error {
 
 func (i *Lifecycler) heartbeat(ctx context.Context) {
 	i.lifecyclerMetrics.consulHeartbeats.Inc()
-	ctx, _ = context.WithTimeout(ctx, i.cfg.HeartbeatPeriod)
-	if err := i.updateConsul(context.Background()); err != nil {
+	ctx, cancel := context.WithTimeout(ctx, i.cfg.HeartbeatPeriod)
+	defer cancel()
+	if err := i.updateConsul(ctx); err != nil {
 		level.Error(i.logger).Log("msg", "failed to write to the KV store, sleeping", "ring", i.RingName, "err", err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -543,8 +543,9 @@ func (i *Lifecycler) loop(ctx context.Context) error {`
`543`	`543`
`544`	`544`	`func (i *Lifecycler) heartbeat(ctx context.Context) {`
`545`	`545`	`i.lifecyclerMetrics.consulHeartbeats.Inc()`
`546`		`- ctx, _ = context.WithTimeout(ctx, i.cfg.HeartbeatPeriod)`
`547`		`- if err := i.updateConsul(context.Background()); err != nil {`
	`546`	`+ ctx, cancel := context.WithTimeout(ctx, i.cfg.HeartbeatPeriod)`
	`547`	`+ defer cancel()`
	`548`	`+ if err := i.updateConsul(ctx); err != nil {`
`548`	`549`	`level.Error(i.logger).Log("msg", "failed to write to the KV store, sleeping", "ring", i.RingName, "err", err)`
`549`	`550`	`}`
`550`	`551`	`}`