github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #386 from Random-Liu/fix-spammy-cni-log

Browse Source 
Get rid of spammy CNI log.
This commit is contained in:
Lantao Liu 2017-11-02 20:40:50 -07:00 committed by GitHub
commit e19e043a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/sandbox_status.go
View File

@ -85,6 +85,11 @@ func (c *criContainerdService) getIP(sandbox sandboxstore.Sandbox) (string, erro
return "", nil return "", nil
} }
// The network namespace has been closed.
if sandbox.NetNS == nil || sandbox.NetNS.Closed() {
return "", nil
}
podNetwork := ocicni.PodNetwork{ podNetwork := ocicni.PodNetwork{
Name: config.GetMetadata().GetName(), Name: config.GetMetadata().GetName(),
Namespace: config.GetMetadata().GetNamespace(), Namespace: config.GetMetadata().GetNamespace(),

7
pkg/store/sandbox/netns.go
View File

@ -111,6 +111,13 @@ func (n *NetNS) Remove() error {
return nil return nil
} }
// Closed checks whether the network namespace has been closed.
func (n *NetNS) Closed() bool {
n.Lock()
defer n.Unlock()
return n.closed
}
// GetPath returns network namespace path for sandbox container // GetPath returns network namespace path for sandbox container
func (n *NetNS) GetPath() string { func (n *NetNS) GetPath() string {
n.Lock() n.Lock()