Skip to content

Prevent concurrent map writes #3703

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
Naatan merged 1 commit into from
Aug 11, 2025
Merged

Prevent concurrent map writes #3703

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
10 changes: 8 additions & 2 deletions pkg/runtime/depot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ type depot struct {
config depotConfig
depotPath string
artifacts map[strfmt.UUID]struct{}
fsMutex *sync.Mutex
fsMutex sync.Mutex
mapMutex sync.Mutex
cacheSize int64
}

Expand Down Expand Up @@ -98,7 +99,6 @@ func newDepot(runtimePath string) (*depot, error) {
},
depotPath: depotPath,
artifacts: map[strfmt.UUID]struct{}{},
fsMutex: &sync.Mutex{},
}

if !fileutils.TargetExists(depotPath) {
Expand Down Expand Up @@ -287,6 +287,9 @@ func (d *depot) DeployViaCopy(id strfmt.UUID, relativeSrc, absoluteDest string)
// This is automatically called by `DeployVia*()` functions.
// This should be called for ecosystems that handle installation of artifacts.
func (d *depot) Track(id strfmt.UUID, deploy *deployment) error {
d.mapMutex.Lock()
defer d.mapMutex.Unlock()

// Record deployment of this artifact.
if _, ok := d.config.Deployments[id]; !ok {
d.config.Deployments[id] = []deployment{}
Expand Down Expand Up @@ -438,6 +441,9 @@ func (d *depot) getSharedFilesToRedeploy(id strfmt.UUID, deploy deployment, path
// Save will write config changes to disk (ie. links between depot artifacts and runtimes that use it).
// It will also delete any stale artifacts which are not used by any runtime.
func (d *depot) Save() error {
d.mapMutex.Lock()
defer d.mapMutex.Unlock()

// Mark artifacts that are no longer used and remove the old ones.
for id := range d.artifacts {
if deployments, ok := d.config.Deployments[id]; !ok || len(deployments) == 0 {
Expand Down
Loading