Skip to content

fix(manager): prevent orphaned alias keys from create/destroy race in containerMap #3925

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
iiiFonryn wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Open

fix(manager): prevent orphaned alias keys from create/destroy race in containerMap #3925

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
3 changes: 2 additions & 1 deletion lib/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,13 +894,14 @@ func (m *manager) createContainer(containerName string, watchSource watcher.Cont
}

// Add the container name and all its aliases. The aliases must be within the namespace of the factory.
m.containers.Store(namespacedName, cont)
for _, alias := range cont.info.Aliases {
m.containers.Store(namespacedContainerName{
Namespace: cont.info.Namespace,
Name: alias,
}, cont)
}
// Store the namespacedName after all aliases. Thus the namespacedName/alias can be detected if leaks.
m.containers.Store(namespacedName, cont)

klog.V(3).Infof("Added container: %q (aliases: %v, namespace: %q)", containerName, cont.info.Aliases, cont.info.Namespace)

Expand Down