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.2: util/log: add more information when log call exceeds deadline #126216

Merged
merged 1 commit into from
Jun 25, 2024
Merged

release-23.2: util/log: add more information when log call exceeds deadline #126216

merged 1 commit into from
Jun 25, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 25, 2024 •
edited by xinhaoz
Loading

Backport 1/1 commits from #123130 on behalf of @xinhaoz.

/cc @cockroachdb/release

For tests like TestHTTSinkTimeout, we want to verify that calls to hanging servers don't last much longer than the timeout configured for the http logging sink. Although this deadline is given a small bit of slack time, we've seen this test seemingly flake a couple of times. We should add more logging for when the log time exceeds the expected deadline to gather more information on if this is an actual bug.

Epic: none
Fixes: #122527

Release justification: test fix

@xinhaoz
util/log: add more information when log call exceeds deadline
44d16f9 
For tests like `TestHTTSinkTimeout`, we want to verify that calls
to hanging servers don't last much longer than the timeout configured
for the http logging sink. Although this deadline is given a small bit
of slack time, we've seen this test seemingly flake a couple of times.
We should add more logging for when the log time exceeds the expected
deadline to gather more information on if this is an actual bug.

This commit also doubles the deadline for `TestHTTPSinkTimeout` from
500ms to 1s, as we've seen some flakes for this test recently.

Epic: none
Fixes: #122527
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-123130 branch from fb5e1c8 to 44d16f9 Compare June 25, 2024 19:01
@blathers-crl blathers-crl bot requested a review from a team as a code owner June 25, 2024 19:01
@blathers-crl blathers-crl bot requested review from kyle-a-wong and removed request for a team June 25, 2024 19:01
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 25, 2024
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Jun 25, 2024 •
edited by xinhaoz
Loading

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 Jun 25, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

kyle-a-wong
kyle-a-wong approved these changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@kyle-a-wong kyle-a-wong left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @dhartunian and @xinhaoz)

@kyle-a-wong kyle-a-wong mentioned this pull request Jun 25, 2024
Closed
@xinhaoz xinhaoz merged commit 6c9e86a into release-23.2 Jun 25, 2024
5 of 6 checks passed
@xinhaoz xinhaoz deleted the blathers/backport-release-23.2-123130 branch June 25, 2024 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kyle-a-wong kyle-a-wong kyle-a-wong approved these changes

@dhartunian dhartunian Awaiting requested review from dhartunian

@xinhaoz xinhaoz Awaiting requested review from xinhaoz

Assignees

@xinhaoz xinhaoz

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cockroach-teamcity @kyle-a-wong @xinhaoz