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: backport #115599 #117505 #117745 #117837

Closed
wants to merge 9 commits into from
Closed

release-23.1: backport #115599 #117505 #117745 #117837

wants to merge 9 commits into from

Conversation

DarrylWong
Copy link
Contributor

@DarrylWong DarrylWong commented Jan 16, 2024 •
edited
Loading

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

Release justification: test-only changes

@herkolategan @DarrylWong
roachtest: add sql instance to functional options
86ad205 
Epic: None
Release Note: None
@herkolategan @DarrylWong
roachtest: add API to start virtual clusters
7045c45 
Previously the cluster interface only exposed a method to start storage nodes,
but that is insufficient to start virtual clusters that have a separate method
on the `roachprod` API (for starting).

This change adds a new method `StartServiceForVirtualCluster` to the cluster
interface to enable roachtests to start virtual clusters. Some refactoring was
required to enable different sets of cluster settings, depending on what service
type is going to be started.

There are now two sets of cluster settings that can be utilised in
`test_runner`. For virtual clusters `virtualClusterSettings` will be used, and
for storage clusters `clusterSettings` will be utilised.

Epic: None
Release Note: None
@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Jan 16, 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 added the backport Label PR's that are backports to older release branches label Jan 16, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@DarrylWong DarrylWong force-pushed the backport23.1-115599-117505-117745 branch from 7f72eee to 274cb4f Compare January 16, 2024 22:23
herkolategan and others added 7 commits January 16, 2024 18:12
@herkolategan @DarrylWong
roachtest: update multitenant/distsql to use new roachprod service APIs
040a6f4 
Previously the multitenant distsql roachtest relied on an internal util in
`roachtest` to start virtual clusters. This change updates the test to use the
new official `roachtest` and `roachprod` APIs for starting virtual clusters.

Fixes: cockroachdb#116019

Epic: None
Release Note: None
@herkolategan @DarrylWong
roachtest: remove unused functions from multitenant utils
33e7dad 
Epic: None
Release Note: None
@herkolategan @DarrylWong
roachtest: document StartServiceForVirtualClusterE
e0c80e3 
Epic: None
Release Note: None
@herkolategan @DarrylWong
roachtest: add DefaultStartVirtualClusterOpts convenience function
c6a8fd7 
Add a convenience function to return `StartOpts` for starting an external
process virtual cluster.

Epic: None
Release Note: None
@DarrylWong
roachtest: assign adminui ports dynamically for virtual clusters
928ed7d 
This was originally removed in cockroachdb#115599 due to cockroachdb#114097 merging,
but adminui was reverted in cockroachdb#117141 and mistakenly did not
revert the special case for virtual clusters.

Release note: None
@DarrylWong
roachtest: discover the adminUIPort for acceptance/gossip/restart-nod…
e87392b 
…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
@renatolabs @DarrylWong
roachprod: use csv when upserting virtual cluster metadata
db07e0d 
Previously, we would run a query with `roachprod sql --format
json`. However, that makes this logic impossible to backport in the
23.1 release branch, since JSON support is not available there.

In this commit, we switch the format to CSV, making this behaviour
more widely supported across branches.

Epic: none

Release note: None
@DarrylWong DarrylWong force-pushed the backport23.1-115599-117505-117745 branch from 274cb4f to db07e0d Compare January 16, 2024 23:12
@DarrylWong DarrylWong mentioned this pull request Feb 6, 2024
Closed
@DarrylWong
Copy link
Contributor Author

branches drifted too much

@DarrylWong DarrylWong closed this Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DarrylWong @cockroach-teamcity @herkolategan @renatolabs