Skip to content

feat(runner): tune minimiser hot path buffers #194

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

Open
linkdata wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(runner): tune minimiser hot path buffers #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pkg/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ type config struct {
IgnoredClientIPsFile string `mapstructure:"ignored-client-ips-file" reload:"true"`
IgnoredQuestionNamesFile string `mapstructure:"ignored-question-names-file" reload:"true"`
DataDir string `mapstructure:"data-dir" validate:"required"`
MinimiserWorkers int `mapstructure:"minimiser-workers" validate:"required"`
MinimiserWorkers int `mapstructure:"minimiser-workers"`
MQTTSigningKeyFile string `mapstructure:"mqtt-signing-key-file" validate:"required_without=DisableMQTT"`
MQTTClientKeyFile string `mapstructure:"mqtt-client-key-file" validate:"required_without=DisableMQTT" reload:"true"`
MQTTClientCertFile string `mapstructure:"mqtt-client-cert-file" validate:"required_without=DisableMQTT" reload:"true"`
Expand Down Expand Up @@ -1585,7 +1585,10 @@ func newDnstapMinimiser(logger *slog.Logger, edmConf edmConfiger) (*dnstapMinimi
edm.promReg = promReg
// Size 32 matches unexported "const outputChannelSize = 32" in
// https://github.com/dnstap/golang-dnstap/blob/master/dnstap.go
edm.inputChannel = make(chan []byte, 32)
// Buffer enough frames to absorb scheduling jitter under high QPS.
// A 1024-frame buffer keeps producers from stalling without growing
// memory meaningfully for typical dnstap frame sizes.
edm.inputChannel = make(chan []byte, 1024)
edm.log = logger
edm.debug = conf.Debug

Expand Down Expand Up @@ -1924,6 +1927,11 @@ func (edm *dnstapMinimiser) runMinimiser(minimiserID int, wg *sync.WaitGroup, se

dt := &dnstap.Dnstap{}

// Per-worker scratch buffer for the unpseudonymised client IP we pass
// to wkdTracker.sendUpdate for HLL hashing. Sized to fit IPv6 and
// resliced to len(QueryAddress) per frame.
var dangerScratch [16]byte

// startConf is used for things that do not handle reconfiguration at runtime
startConf := edm.getConfig()

Expand Down Expand Up @@ -1967,8 +1975,16 @@ minimiserLoop:

// Keep around the unpseudonymised client IP for HLL
// data, be careful with logging or otherwise handling
// this IP as it is sensitive.
dangerRealClientIP := make([]byte, len(dt.Message.QueryAddress))
// this IP as it is sensitive. Borrow the per-worker
// scratch buffer and fall back to allocation for any
// unexpected non-IPv4/non-IPv6 address length.
n := len(dt.Message.QueryAddress)
var dangerRealClientIP []byte
if n <= len(dangerScratch) {
dangerRealClientIP = dangerScratch[:n]
} else {
dangerRealClientIP = make([]byte, n)
}
copy(dangerRealClientIP, dt.Message.QueryAddress)

edm.pseudonymiseDnstap(dt)
Expand Down