Skip to content

Commit

Permalink
jobs: remove workaround for tracing span leak in registry
Browse files Browse the repository at this point in the history
This reverts the workaround added in
3ae0f06 to close the tracing span
for job resumers prematurely to avoid a leak.

Release note: None
  • Loading branch information
thoszhang committed Feb 23, 2021
1 parent fe6377c commit ffe4a45
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions pkg/jobs/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -549,14 +549,6 @@ func (r *Registry) CreateStartableJobWithTxn(
_, span = tracing.ForkSpan(ctx, "job")
if span != nil {
resumerCtx = tracing.ContextWithSpan(resumerCtx, span)

// This trace span unfortunately is sometimes never finished.
// As a hack/workaround, finish it now so that it leaves the
// tracer registry.
//
// Remove this when this issue is fixed:
// https://github.com/cockroachdb/cockroach/issues/60671
span.Finish()
}

if r.startUsingSQLLivenessAdoption(ctx) {
Expand Down

0 comments on commit ffe4a45

Please sign in to comment.