Skip to content

Commit

Permalink
roachprod: default to buffering file sinks in roachprod
Browse files Browse the repository at this point in the history
In roachprod clusters, default to using buffering in file sinks. This is
required by a subsequent change that will default to using WAL failover in
roachprod clusters.

Informs #133248
Informs #129922
Epic: CRDB-37534
Release note: none
  • Loading branch information
jbowens committed Oct 23, 2024
1 parent 954c012 commit 7095a46
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 0 additions & 3 deletions pkg/cmd/roachtest/tests/disk_stall.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ func runDiskStalledWALFailover(
startOpts.RoachprodOpts.StoreCount = 2
}
startOpts.RoachprodOpts.ExtraArgs = []string{
// Adopt buffering of the file logging to ensure that we don't block on
// flushing logs to the stalled device.
"--log", fmt.Sprintf(`{file-defaults: {dir: "%s", buffered-writes: false, buffering: {max-staleness: 1s, flush-trigger-size: 256KiB, max-buffer-size: 50MiB}}}`, s.LogDir()),
"--wal-failover=" + failoverFlag,
}
c.Start(ctx, t.L(), startOpts, startSettings, c.CRDBNodes())
Expand Down
6 changes: 5 additions & 1 deletion pkg/roachprod/install/files/cockroachdb-logging.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
---
file-defaults:
auditable: false
buffered-writes: true
buffered-writes: false
buffering:
max-staleness: 5s
flush-trigger-size: 256KiB
max-buffer-size: 50MiB
dir: #{ .LogDir #}
exit-on-error: false
filter: INFO
Expand Down

0 comments on commit 7095a46

Please sign in to comment.