Skip to content

host: guard discoverd config setup in SetDefaultEnv to fix data race #10

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

Merged
phaus merged 1 commit into from
Sep 4, 2026
Merged

host: guard discoverd config setup in SetDefaultEnv to fix data race #10

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
15 changes: 11 additions & 4 deletions host/libcontainer_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,12 @@ type LibcontainerBackend struct {
envMtx sync.RWMutex
defaultEnv map[string]string

discoverdConfigured chan struct{}
networkConfigured chan struct{}
// discoverdConfigured is closed once discoverd has been configured via
// SetDefaultEnv. discoverdConfiguredSet is guarded by envMtx and tracks
// whether the channel has already been closed to prevent a double close.
discoverdConfigured chan struct{}
discoverdConfiguredSet bool
networkConfigured chan struct{}

globalStateMtx sync.Mutex
globalState *libcontainerGlobalState
Expand Down Expand Up @@ -419,11 +423,14 @@ func (l *LibcontainerBackend) ServeDHCP(p dhcp.Packet, msgType dhcp.MessageType,

func (l *LibcontainerBackend) SetDefaultEnv(k, v string) {
l.envMtx.Lock()
defer l.envMtx.Unlock()
l.defaultEnv[k] = v
l.envMtx.Unlock()
if k == "DISCOVERD" {
l.discoverdClient = discoverd.NewClientWithURL(v)
close(l.discoverdConfigured)
if !l.discoverdConfiguredSet {
l.discoverdConfiguredSet = true
close(l.discoverdConfigured)
}
}
}

Expand Down
Loading