Skip to content

server: fix TestAdminAPIJobs failure#70150

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
adityamaru:fix-flake-69401
Sep 15, 2021
Merged

server: fix TestAdminAPIJobs failure#70150
craig[bot] merged 1 commit intocockroachdb:masterfrom
adityamaru:fix-flake-69401

Conversation

@adityamaru
Copy link
Copy Markdown
Contributor

This change sorts the expected job IDs before ensuring
that they are equal.

Fixes: #69401

Release note: None

This change sorts the expected job IDs before ensuring
that they are equal.

Fixes: cockroachdb#69401

Release note: None
@adityamaru adityamaru requested a review from knz September 13, 2021 18:47
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@adityamaru
Copy link
Copy Markdown
Contributor Author

I couldn't reproduce the failure, and it doesn't seem to have failed in a while. Eyeballing the error, the order is what seems mismatched, so adding this patch can only help.

Copy link
Copy Markdown
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

Reviewed all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@adityamaru
Copy link
Copy Markdown
Contributor Author

dev-inf is investigating the shards timing out in pkg/server. I believe it is a misconfiguration rather than a fallout from this change.

bors r=knz

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Sep 15, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Sep 15, 2021

Build succeeded:

@craig craig bot merged commit f278e64 into cockroachdb:master Sep 15, 2021
@jocrl
Copy link
Copy Markdown
Contributor

jocrl commented Dec 9, 2021

Going to backport this to 21.2, to fix the test failing for #73624

@jocrl
Copy link
Copy Markdown
Contributor

jocrl commented Dec 9, 2021

blathers backport 21.2

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.

server: TestAdminAPIJobs failed

4 participants