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.12-rc: server, util: fix failing TestServerController #130883

Merged

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 17, 2024

Backport 1/1 commits from #130850 on behalf of @shubhamdhama.

/cc @cockroachdb/release


The TestServerController test server stops quickly (due to deferred stop) after executing CREATE TENANT hello while the creation of the tenant is ongoing in newTenantServer. This causes baseCfg.CidrLookup.Start in newTenantServer to fail with ErrUnavailable because s.runPrelude() in stopper.RunAsyncTask returns true if a server is stopping:

if !s.runPrelude() {
return ErrUnavailable
}
.

Fixes: #130757
Epic: CRDB-42208
Release note: None


Release justification: fix failing TestServerController.

The `TestServerController` test server stops quickly (due to deferred stop)
after executing `CREATE TENANT hello` while the creation of the tenant is
ongoing in `newTenantServer`. This causes `baseCfg.CidrLookup.Start` in
`newTenantServer` to fail with `ErrUnavailable` because `s.runPrelude()` in
`stopper.RunAsyncTask` returns true if a server is stopping:
https://github.com/cockroachdb/cockroach/blob/3bf34dc3a192d7efeee8aa97e46bf73f817b2b9b/pkg/util/stop/stopper.go#L469-L471.

Fixes: #130757
Epic: CRDB-42208
Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners September 17, 2024 15:23
@blathers-crl blathers-crl bot requested review from angles-n-daemons and removed request for a team September 17, 2024 15:23
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2.12-rc-130850 branch from 7b8fd7d to b200f20 Compare September 17, 2024 15:23
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 17, 2024
Copy link
Author

blathers-crl bot commented Sep 17, 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. 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 Sep 17, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@andrewbaptist andrewbaptist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@shubhamdhama shubhamdhama merged commit c2e8070 into release-23.2.12-rc Sep 19, 2024
5 of 6 checks passed
@shubhamdhama shubhamdhama deleted the blathers/backport-release-23.2.12-rc-130850 branch September 19, 2024 09:07
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.

3 participants