Skip to content

roachprod: revert AdminUIPort back to DefaultAdminUIPort#117141

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
DarrylWong:revert-adminuiport
Dec 28, 2023
Merged

roachprod: revert AdminUIPort back to DefaultAdminUIPort#117141
craig[bot] merged 1 commit intocockroachdb:masterfrom
DarrylWong:revert-adminuiport

Conversation

@DarrylWong
Copy link
Copy Markdown
Contributor

The change #114097 removed default port assumptions for SQLPort and AdminUIPort, and instead finds open ports to assign. However, Prometheus scraping relies on this hardcoded AdminUIPort as it can't discover the port itself.

This change temporarily reverts AdminUIPort back to the hardcoded port.

Release note: none
Epic: none
Informs: #117125

@DarrylWong DarrylWong requested a review from a team as a code owner December 28, 2023 16:18
@DarrylWong DarrylWong requested review from herkolategan and srosenberg and removed request for a team December 28, 2023 16:18
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@DarrylWong
Copy link
Copy Markdown
Contributor Author

Confirmed we get data again:
image

@DarrylWong DarrylWong force-pushed the revert-adminuiport branch 2 times, most recently from 855cacc to 9de6161 Compare December 28, 2023 17:58
The change cockroachdb#114097 removed default port assumptions for SQLPort and AdminUIPort,
and instead finds open ports to assign. However, Prometheus scraping relies on
this hardcoded AdminUIPort as it can't discover the port itself.

This change temporarily reverts AdminUIPort back to the hardcoded port.

Release note: none
Epic: none
Informs: cockroachdb#117125
@DarrylWong
Copy link
Copy Markdown
Contributor Author

I had to split up the error checking for disallowing custom ports for local. It was throwing an error if SQLPort=0 and AdminUIPort=default even though this should be a valid case.

I think CI should be happy now.

@DarrylWong
Copy link
Copy Markdown
Contributor Author

TFTR!

bors r=srosenberg

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Dec 28, 2023

Build succeeded:

@craig craig bot merged commit 3eea697 into cockroachdb:master Dec 28, 2023
DarrylWong added a commit to DarrylWong/fork that referenced this pull request Jan 8, 2024
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 added a commit to DarrylWong/fork that referenced this pull request Jan 8, 2024
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
craig bot pushed a commit that referenced this pull request Jan 10, 2024
117505: roachtest: assign adminui ports dynamically for virtual clusters r=srosenberg,renatolabs a=DarrylWong

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

117545: rpc: rm rangefeed RPC stream window special case r=erikgrinaker,miretskiy a=pav-kv

The rangefeed stream window size tuning was introduced to mitigate OOM in rangefeeds caused by the excessive number of streams (one per `Range`). Since we now use mux rangefeeds (which multiplexes all the rangefeed traffic into a single stream), this setting is no longer needed, so this commit removes it.

Part of #108992

Release note (ops change): `COCKROACH_RANGEFEED_RPC_INITIAL_WINDOW_SIZE` env variable has been removed, and rangefeed connection now uses the same window size as other RPC connections.

117554: sqlproxyccl: improve authentication throttle error r=JeffSwenson a=JeffSwenson

The sql proxy will throttle connection attempts if a (client IP, tenant cluster) pair has too many authentication failures. The error is usually caused by a misconfigured password in a connection pool. This change replaces the "connection attempt throttled" error message with "too many failed authentication attempts". There is a hint that includes this message but not all drivers are configured to log hints.

Fixes #117552

Co-authored-by: DarrylWong <darryl@cockroachlabs.com>
Co-authored-by: Pavel Kalinnikov <pavel@cockroachlabs.com>
Co-authored-by: Jeff <swenson@cockroachlabs.com>
blathers-crl bot pushed a commit that referenced this pull request Jan 10, 2024
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
DarrylWong added a commit that referenced this pull request Jan 12, 2024
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
DarrylWong added a commit to DarrylWong/fork that referenced this pull request Jan 16, 2024
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 added a commit to DarrylWong/fork that referenced this pull request Feb 6, 2024
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants