jobs: avoid a dangling goroutine

Release note: None
cockroachdb · Mar 13, 2023 · cd7b335 · cd7b335
1 parent e0cfcc1
commit cd7b335
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/jobs/adopt.go b/pkg/jobs/adopt.go
@@ -323,6 +323,8 @@ func (r *Registry) resumeJob(
 		resumeCtx = multitenant.WithTenantCostControlExemption(resumeCtx)
 	}
 	if alreadyAdopted := r.addAdoptedJob(jobID, s, cancel); alreadyAdopted {
+		// Not needing the context after all. Avoid leaking resources.
+		cancel()
 		return nil
 	}
 
@@ -333,6 +335,8 @@ func (r *Registry) resumeJob(
 		_ = r.runJob(resumeCtx, resumer, job, status, job.taskName())
 	}); err != nil {
 		r.unregister(jobID)
+		// Also avoid leaking a goroutine in this case.
+		cancel()
 		return err
 	}
 	return nil