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

roachtest: change network_logging to buffered_logging, include files #123431

Merged
merged 1 commit into from
May 3, 2024

Conversation

abarganier
Copy link
Member

Addresses: #120759

Previously, the network_logging roachtest was created to put the bufferedSink (an async producer+consumer buffer that we primarily use to wrap network log sinks) through its paces. Originally, this functionality was only available to network (fluent,http) log sinks, and so the test did not include any file based log sinks.

As of #120428, we now support the ability to use async buffering on file-group log sinks as well, via the same bufferedSink. Therefore, it makes sense that we should expand our existing network_logging roachtest to also include file sinks.

This commit does so by expanding the log config to enable async buffering for files by default, and adds three file-groups log sinks to the config that capture all log channels. This will now run alongside the existing network logging sinks.

As a final step, since this test is no longer specific to network logging, we rename the roachtest from network_logging to buffered_logging.

Release note: none

Epic: CRDB-35401

Addresses: cockroachdb#120759

Previously, the `network_logging` roachtest was created to put the
`bufferedSink` (an async producer+consumer buffer that we primarily use
to wrap network log sinks) through its paces. Originally, this
functionality was only available to network (`fluent`,`http`) log sinks,
and so the test did not include any file based log sinks.

As of cockroachdb#120428, we now
support the ability to use async buffering on `file-group` log sinks as
well, via the same `bufferedSink`. Therefore, it makes sense that we
should expand our existing `network_logging` roachtest to also include
file sinks.

This commit does so by expanding the log config to enable async
buffering for files by default, and adds three `file-groups` log sinks
to the config that capture all log channels. This will now run alongside
the existing network logging sinks.

As a final step, since this test is no longer specific to network
logging, we rename the roachtest from `network_logging` to
`buffered_logging`.

Release note: none
@abarganier abarganier requested review from a team and xinhaoz and removed request for a team May 1, 2024 22:52
@abarganier abarganier requested a review from a team as a code owner May 1, 2024 22:52
@abarganier abarganier requested review from herkolategan and srosenberg and removed request for a team May 1, 2024 22:52
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@abarganier
Copy link
Member Author

TFTR!

bors r=dhartunian

craig bot pushed a commit that referenced this pull request May 3, 2024
123431: roachtest: change `network_logging` to `buffered_logging`, include files r=dhartunian a=abarganier

Addresses: #120759

Previously, the `network_logging` roachtest was created to put the `bufferedSink` (an async producer+consumer buffer that we primarily use to wrap network log sinks) through its paces. Originally, this functionality was only available to network (`fluent`,`http`) log sinks, and so the test did not include any file based log sinks.

As of #120428, we now support the ability to use async buffering on `file-group` log sinks as well, via the same `bufferedSink`. Therefore, it makes sense that we should expand our existing `network_logging` roachtest to also include file sinks.

This commit does so by expanding the log config to enable async buffering for files by default, and adds three `file-groups` log sinks to the config that capture all log channels. This will now run alongside the existing network logging sinks.

As a final step, since this test is no longer specific to network logging, we rename the roachtest from `network_logging` to `buffered_logging`.

Release note: none

Epic: CRDB-35401

Co-authored-by: Alex Barganier <abarganier@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented May 3, 2024

Build failed:

@abarganier
Copy link
Member Author

bors retry

@craig craig bot merged commit 12f3d97 into cockroachdb:master May 3, 2024
22 checks passed
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.

None yet

3 participants