Skip to content

jobs: add a span to resumed jobs (for /debug/requests goodness)#27422

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
danhhz:jobs_span
Jul 12, 2018
Merged

jobs: add a span to resumed jobs (for /debug/requests goodness)#27422
craig[bot] merged 1 commit intocockroachdb:masterfrom
danhhz:jobs_span

Conversation

@danhhz
Copy link
Copy Markdown
Contributor

@danhhz danhhz commented Jul 12, 2018

Release note: None

@danhhz danhhz requested review from a team and benesch July 12, 2018 01:41
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@benesch benesch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)


pkg/sql/jobs/registry.go, line 23 at r1 (raw file):

	"time"

	"github.com/cockroachdb/cockroach/pkg/settings"

If you happen to go through CI again, the pkg/settings import should be in the next block.

Copy link
Copy Markdown
Contributor Author

@danhhz danhhz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review!

bors r=benesch

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)


pkg/sql/jobs/registry.go, line 23 at r1 (raw file):

Previously, benesch (Nikhil Benesch) wrote…

If you happen to go through CI again, the pkg/settings import should be in the next block.

Done.

craig bot pushed a commit that referenced this pull request Jul 12, 2018
27422: jobs: add a span to resumed jobs (for /debug/requests goodness) r=benesch a=danhhz

Release note: None

Co-authored-by: Daniel Harrison <daniel.harrison@gmail.com>
Copy link
Copy Markdown
Contributor

@benesch benesch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r2.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)


pkg/sql/jobs/registry_external_test.go, line 89 at r2 (raw file):

		const adoptInterval = time.Nanosecond

		ac := log.AmbientContext{Tracer: tracing.NewTracer()}

Doesn't this need to be r.settings.Tracer? At least, it is in every other non-test AmbientContext. I'm not familiar with tracing at all though to know exactly what might go wrong if you create a fresh tracer.

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 12, 2018

Build succeeded

@craig craig bot merged commit c3ab84a into cockroachdb:master Jul 12, 2018
Copy link
Copy Markdown
Contributor Author

@danhhz danhhz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)


pkg/sql/jobs/registry_external_test.go, line 89 at r2 (raw file):

Previously, benesch (Nikhil Benesch) wrote…

Doesn't this need to be r.settings.Tracer? At least, it is in every other non-test AmbientContext. I'm not familiar with tracing at all though to know exactly what might go wrong if you create a fresh tracer.

Argh, sorry. I'd kicked off bors and didn't see this before it merged. There's quite a bit of precedent for log.AmbientContext{Tracer: tracing.NewTracer()} in tests and I only added this to fix a panic.

Copy link
Copy Markdown
Contributor

@benesch benesch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)


pkg/sql/jobs/registry_external_test.go, line 89 at r2 (raw file):

Previously, danhhz (Daniel Harrison) wrote…

Argh, sorry. I'd kicked off bors and didn't see this before it merged. There's quite a bit of precedent for log.AmbientContext{Tracer: tracing.NewTracer()} in tests and I only added this to fix a panic.

No worries! It didn't seem like a serious enough problem to cancel your merge! I'm not even sure if it's a problem at all.

@danhhz danhhz deleted the jobs_span branch July 17, 2018 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants