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

release-23.2: roachtest: assign adminui ports dynamically for virtual clusters #117626

Merged
merged 2 commits into from
Jan 10, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jan 10, 2024

Backport 2/2 commits from #117505 on behalf of @DarrylWong.

/cc @cockroachdb/release


This was originally removed in #115599 due to #114097 merging, but adminui was reverted in #117141 and mistakenly did not revert the special case for virtual clusters. We unskip the multitenant/distsql tests as well.

Release note: None
Fixes: #117150
Fixes: #117149
Epic: None


Release justification: test-only change.

This was originally removed in #115599 due to #114097 merging,
but adminui was reverted in #117141 and mistakenly did not
revert the special case for virtual clusters.

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner January 10, 2024 18:52
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-117505 branch from 29eb83f to 22946ed Compare January 10, 2024 18:52
@blathers-crl blathers-crl bot requested review from DarrylWong and renatolabs and removed request for a team January 10, 2024 18:52
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 10, 2024
Copy link
Author

blathers-crl bot commented Jan 10, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot requested a review from srosenberg January 10, 2024 18:52
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jan 10, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@DarrylWong
Copy link
Contributor

#114097 hasn't been backported yet so I think we need to set sqlport to 0 as well (I can get to this soon, just mentioning)

@yuzefovich
Copy link
Member

Thanks. I see that we backported #116525 yesterday, so we got failures today on 23.2 branch. I'll defer to you Darryl on what needs to be done to fix those.

…e-one

This test relies on assumption `adminUIPort = SQLPort + 1` but adminui is
temporarily hardcoded as 26258 while SQLPort will be dynamically assigned
without the following override. This changes it to discover the port instead
of relying on this assumption.

Release note: None
@DarrylWong DarrylWong force-pushed the blathers/backport-release-23.2-117505 branch from 22946ed to 1467d64 Compare January 10, 2024 21:06
@DarrylWong
Copy link
Contributor

Added startOpts.RoachprodOpts.SQLPort = 0 and confirmed multitenant/distsql tests pass on gceworker

@DarrylWong DarrylWong merged commit f1b490a into release-23.2 Jan 10, 2024
5 of 6 checks passed
@DarrylWong DarrylWong deleted the blathers/backport-release-23.2-117505 branch January 10, 2024 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants