Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jobs: only force jobs.MaybeGenerateForcedRetryableError in 23.1 #113864

Merged
merged 3 commits into from Nov 6, 2023

Conversation

dt
Copy link
Member

@dt dt commented Nov 6, 2023

Broken into a couple commits for ease of review:

  1. jobs: plumb cluster version to info table accessor

This is a pure refactor to plumb a clusterversion.Handle to the info table accessor
via all the call sites and wrapping structs/call trees; no behavior change, or usage
of the plumbed cv, is added in this commit.

  1. jobs: only force jobs.MaybeGenerateForcedRetryableError in 23.1

  2. jobs: only store 23.1 debugging info after 23.1 upgrade

Release note (bug fix): fixed a bug that could cause 23.1 nodes in clusters which had not finalized the 23.1
version upgrade to use excessive CPU retrying expected errors related to the incomplete upgrade state.

Informs #113795.

@dt dt requested review from a team as code owners November 6, 2023 14:22
@dt dt requested review from miretskiy, abarganier and yuzefovich and removed request for a team November 6, 2023 14:22
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich yuzefovich removed their request for review November 6, 2023 15:17
@dt dt force-pushed the cv-info branch 2 times, most recently from e3b51d8 to f643bc6 Compare November 6, 2023 16:34
This is a pure refactor to plumb a clusterversion.Handle to the info table accessor
via all the call sites and wrapping structs/call trees; no behavior change, or usage
of the plumbed cv, is added in this commit.

Release note: none.
Epic: none.
Release note (bug fix): fixed a bug that could cause 23.1 nodes in clusters which had not finalized the 23.1
version upgrade to use excessive CPU retrying expected errors related to the incomplete upgrade state.
Copy link
Contributor

@adityamaru adityamaru 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 doing this

@abarganier abarganier removed their request for review November 6, 2023 19:08
@dt dt requested a review from andyyang890 November 6, 2023 20:02
@dt dt added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.1.12-rc.FROZEN labels Nov 6, 2023
Copy link
Contributor

@miretskiy miretskiy left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

@dt
Copy link
Member Author

dt commented Nov 6, 2023

TFTRs!

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 6, 2023

Build succeeded:

@craig craig bot merged commit 8899d03 into cockroachdb:master Nov 6, 2023
7 checks passed
Copy link

blathers-crl bot commented Nov 6, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 881576e to blathers/backport-release-23.1-113864: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


error creating merge commit from 881576e to blathers/backport-release-23.1.12-rc.FROZEN-113864: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.12-rc.FROZEN failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@dt dt deleted the cv-info branch November 7, 2023 13:22
craig bot pushed a commit that referenced this pull request Nov 26, 2023
114069: jobs: remove jobs.MaybeGenerateForcedRetryableError r=dt a=dt

Revert 3/3 commits from #113864 and then delete jobs.MaybeGenerateForcedRetryableError since it is not needed on master as master (24.1) will never run the 22.2 to 23.1 upgrade.

Epic: none.

Co-authored-by: David Taylor <tinystatemachine@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants