Skip to content

release-23.1: serverccl: conditionally apply DevOffset in TestServerStartupGuardrails#100729

Merged
renatolabs merged 1 commit intorelease-23.1from
blathers/backport-release-23.1-100701
Apr 5, 2023
Merged

release-23.1: serverccl: conditionally apply DevOffset in TestServerStartupGuardrails#100729
renatolabs merged 1 commit intorelease-23.1from
blathers/backport-release-23.1-100701

Conversation

@blathers-crl
Copy link
Copy Markdown

@blathers-crl blathers-crl bot commented Apr 5, 2023 •
edited by renatolabs
Loading

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

/cc @cockroachdb/release

When overwriting versions for that test, we were unconditionally applying clusterversion.DevOffset to all versions. While that works on master, it makes the test break when it runs on a release branch (where no offsetting happens). In this commit, we check whether binary versions are offset, and only add the DevOffset if they are.

Unfortunately, we can't reference versions by key in this test as it references versions from two releases ago.

Informs: #100685

Epic: none

Release note: None

Release justification: test-only change

serverccl: conditionally apply DevOffset in TestServerStartupGuardrails
5027505 
When overwriting versions for that test, we were unconditionally
applying `clusterversion.DevOffset` to all versions. While that works
on master, it makes the test break when it runs on a release
branch (where no offsetting happens). In this commit, we check whether
binary versions are offset, and only add the DevOffset if they are.

Unfortunately, we can't reference versions by key in this test as it
references versions from two releases ago.

Informs: #100685

Epic: none

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner April 5, 2023 16:47
@blathers-crl
Copy link
Copy Markdown
Author

blathers-crl bot commented Apr 5, 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 force-pushed the blathers/backport-release-23.1-100701 branch from e4b0574 to 5027505 Compare April 5, 2023 16:47
@blathers-crl blathers-crl bot requested a review from knz April 5, 2023 16:47
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Apr 5, 2023
@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Apr 5, 2023

This change is Reviewable

@celiala celiala mentioned this pull request Apr 5, 2023
Closed
2 tasks
@renatolabs renatolabs merged commit 19ef9e4 into release-23.1 Apr 5, 2023
@renatolabs renatolabs deleted the blathers/backport-release-23.1-100701 branch April 5, 2023 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@knz knz knz approved these changes

Reviewers whose approvals may not affect merge requirements

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 @knz @renatolabs