Skip to content
Open
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions pkg/metrics/collector/netlink_metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ func getNamespaces() ([]netns.NsHandle, error) {
}
// Check for a new inode.
if err := unix.Fstat(int(ns), &s); err != nil {
ns.Close()
continue
}
if _, ok := nsSet[s.Ino]; ok {
Expand All @@ -285,36 +286,44 @@ func getSnapshots(req *nl.NetlinkRequest) ([]*parser.Snapshot, error) {
if err != nil {
return nil, err
}
defer func() {
for _, ns := range namespaces {
ns.Close()
}
}()
basens, err := netns.Get()
if err != nil {
return nil, err
}
defer basens.Close()
for _, curNs := range namespaces {
defer curNs.Close()
s, err := nl.SubscribeAt(curNs, basens, sockType)
if err != nil {
glog.Infof("Could not subscribe to netlink namespaces %q", curNs)
continue
}
defer s.Close()
if err := s.Send(req); err != nil { //nolint:govet
if err = s.Send(req); err != nil {
s.Close()
return nil, err
}
pid, err := s.GetPid()
if err != nil {
s.Close()
return nil, err
}
// Adapted this from req.Execute in nl_linux.go
snapshotLoop:
for {
msgs, _, err := s.Receive()
if err != nil {
s.Close()
return nil, err
}
// TODO avoid the copy.
for i := range msgs {
m, shouldContinue, err := inetdiag.ProcessMessage(&msgs[i], req.Seq, pid)
if err != nil {
s.Close()
return nil, err
}
if m != nil {
Expand All @@ -331,6 +340,7 @@ func getSnapshots(req *nl.NetlinkRequest) ([]*parser.Snapshot, error) {
}

}
s.Close()
}

return snps, nil
Expand Down
Loading