roachtest: assign adminui ports dynamically for virtual clusters #117505
Conversation
|
This change is |
|
Ran |
DarrylWong
force-pushed
the
multitenant-adminui
branch
2 times, most recently
from
0631a3f to
c5171af
Compare
DarrylWong
force-pushed
the
multitenant-adminui
branch
from
c5171af to
433ce79
Compare
DarrylWong
requested review from
srosenberg and
renatolabs
and removed request for
a team
|
LGTM, but probably worth waiting for #117480 to merge and then unskip those tests in this PR. |
pkg/cmd/roachtest/tests/gossip.go
Outdated
| @@ -338,7 +339,13 @@ func runGossipRestartNodeOne(ctx context.Context, t test.Test, c cluster.Cluster | |||
| settings := install.MakeClusterSettings(install.NumRacksOption(c.Spec().NodeCount)) | |||
| settings.Env = append(settings.Env, "COCKROACH_SCAN_MAX_IDLE_TIME=5ms") | |||
|
|
|||
| c.Start(ctx, t.L(), option.DefaultStartOpts(), settings) | |||
| // TODO(darrylwong): remove SetDefaultSQLPort once #117125 is addressed. | |||
There was a problem hiding this comment.
Given the below assumption, is the TODO still relevant? i.e., if I understood correctly, this test fails if the invariant adminUIPort = SQLPort + 1 doesn't hold, right?
There was a problem hiding this comment.
Yeah that's true, if we change the port assignment logic then it will fail again.
I changed it to discover the port instead, which seems more correct to me anyway.
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
force-pushed
the
multitenant-adminui
branch
from
433ce79 to
fdea06a
Compare
pkg/cmd/roachtest/cluster.go
Outdated
| @@ -2490,6 +2490,12 @@ func (c *clusterImpl) ExternalAdminUIAddr( | |||
| return c.adminUIAddr(ctx, l, node, true) | |||
| } | |||
|
|
|||
| func (c *clusterImpl) AdminUIPort( | |||
There was a problem hiding this comment.
Nit: Maybe AdminUIPorts, since this is returning an array of ports?
pkg/cmd/roachtest/cluster.go
Outdated
| @@ -2490,6 +2490,12 @@ func (c *clusterImpl) ExternalAdminUIAddr( | |||
| return c.adminUIAddr(ctx, l, node, true) | |||
| } | |||
|
|
|||
| func (c *clusterImpl) AdminUIPort( | |||
| ctx context.Context, l *logger.Logger, node option.NodeListOption, | |||
There was a problem hiding this comment.
nodes, since that argument is a collection?
pkg/roachprod/roachprod.go
Outdated
| @@ -1074,6 +1074,28 @@ func AdminURL( | |||
| return urlGenerator(ctx, c, l, c.TargetNodes(), uConfig) | |||
| } | |||
|
|
|||
| // AdminPort finds the AdminUI ports for a cluster. | |||
| func AdminPort( | |||
pkg/roachprod/roachprod.go
Outdated
| for _, node := range c.Nodes { | ||
| port, err := c.NodeUIPort(ctx, node) | ||
| if err != nil { | ||
| return nil, err |
There was a problem hiding this comment.
Nit: might be a good idea to include the node in the error message.
pkg/cmd/roachtest/cluster.go
Outdated
| func (c *clusterImpl) AdminUIPort( | ||
| ctx context.Context, l *logger.Logger, node option.NodeListOption, | ||
| ) ([]int, error) { | ||
| return roachprod.AdminPort(ctx, l, c.MakeNodes(node), c.localCertsDir != "") |
There was a problem hiding this comment.
We can use c.IsSecure() here.
…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
force-pushed
the
multitenant-adminui
branch
from
fdea06a to
f6519af
Compare
|
TFTRs bors r=srosenberg, renatolabs |
|
This PR was included in a batch that timed out, it will be automatically retried |
|
Build succeeded: |
|
blathers backport 23.2 |
|
blathers backport 23.1 |
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from ca0d2ed to blathers/backport-release-23.1-117505: 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 failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
blathers backport 23.1 |
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