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.

Sign up for GitHub

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

Jump to bottom

release-23.1: roachtest: fix query used to get job status in backup/mixed-version #100332

Merged
merged 1 commit into from
Mar 31, 2023
Merged

release-23.1: roachtest: fix query used to get job status in backup/mixed-version #100332

merged 1 commit into from
Mar 31, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 31, 2023 •
edited by renatolabs
Loading

Backport 1/1 commits from #99865 on behalf of @renatolabs.

/cc @cockroachdb/release

At the moment, we only query job status in mixed-version state (so we should always use system.jobs). However, the code added in this commit should continue to work once we start developing 23.2, as we're checking that the cluster version is at least 23.1 before using crdb_internal.system_jobs.

Epic: none

Release note: None

Release justification: test-only change.

@renatolabs
roachtest: fix query used to get job status in backup/mixed-version
2f9d252 
At the moment, we only query job status in mixed-version state (so we
should always use `system.jobs`). However, the code added in this
commit should continue to work once we start developing 23.2, as we're
checking that the cluster version is at least 23.1 before using
`crdb_internal.system_jobs`.

Epic: none

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner March 31, 2023 17:49
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99865 branch from 3fc51ba to 11b5d1b Compare March 31, 2023 17:49
@blathers-crl blathers-crl bot requested review from srosenberg and smg260 and removed request for a team March 31, 2023 17:49
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99865 branch from b2d924f to 2f9d252 Compare March 31, 2023 17:49
@blathers-crl blathers-crl bot requested a review from adityamaru March 31, 2023 17:49
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 31, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 31, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@renatolabs renatolabs merged commit 5cbc88c into release-23.1 Mar 31, 2023
@renatolabs renatolabs deleted the blathers/backport-release-23.1-99865 branch March 31, 2023 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srosenberg srosenberg srosenberg approved these changes

@smg260 smg260 Awaiting requested review from smg260 smg260 is a code owner automatically assigned from cockroachdb/test-eng

@adityamaru adityamaru Awaiting requested review from adityamaru

Assignees

@renatolabs renatolabs

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @srosenberg @renatolabs