lib/sandbox: clarify variable names
three uses of `ns` :-\ Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
parent
f6a825d7e0
commit
ebdec2ea5b
|
@ -23,13 +23,13 @@ import (
|
|||
// NetNs handles data pertaining a network namespace
|
||||
type NetNs struct {
|
||||
sync.Mutex
|
||||
ns ns.NetNS
|
||||
nn ns.NetNS
|
||||
symlink *os.File
|
||||
closed bool
|
||||
restored bool
|
||||
}
|
||||
|
||||
func (ns *NetNs) symlinkCreate(name string) error {
|
||||
func (nns *NetNs) symlinkCreate(name string) error {
|
||||
b := make([]byte, 4)
|
||||
_, randErr := rand.Reader.Read(b)
|
||||
if randErr != nil {
|
||||
|
@ -39,7 +39,7 @@ func (ns *NetNs) symlinkCreate(name string) error {
|
|||
nsName := fmt.Sprintf("%s-%x", name, b)
|
||||
symlinkPath := filepath.Join(NsRunDir, nsName)
|
||||
|
||||
if err := os.Symlink(ns.ns.Path(), symlinkPath); err != nil {
|
||||
if err := os.Symlink(nns.nn.Path(), symlinkPath); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -52,21 +52,19 @@ func (ns *NetNs) symlinkCreate(name string) error {
|
|||
return err
|
||||
}
|
||||
|
||||
ns.symlink = fd
|
||||
nns.symlink = fd
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ns *NetNs) symlinkRemove() error {
|
||||
if err := ns.symlink.Close(); err != nil {
|
||||
func (nns *NetNs) symlinkRemove() error {
|
||||
if err := nns.symlink.Close(); err != nil {
|
||||
return fmt.Errorf("failed to close net ns symlink: %v", err)
|
||||
}
|
||||
|
||||
if err := os.RemoveAll(ns.symlink.Name()); err != nil {
|
||||
if err := os.RemoveAll(nns.symlink.Name()); err != nil {
|
||||
return fmt.Errorf("failed to remove net ns symlink: %v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func isSymbolicLink(path string) (bool, error) {
|
||||
|
@ -105,7 +103,7 @@ func NetNsGet(nspath, name string) (*NetNs, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
netNs := &NetNs{ns: netNS, closed: false, restored: true}
|
||||
netNs := &NetNs{nn: netNS, closed: false, restored: true}
|
||||
|
||||
if symlink {
|
||||
fd, err := os.Open(nspath)
|
||||
|
@ -393,7 +391,7 @@ func (s *Sandbox) NetNs() ns.NetNS {
|
|||
return nil
|
||||
}
|
||||
|
||||
return s.netns.ns
|
||||
return s.netns.nn
|
||||
}
|
||||
|
||||
// NetNsPath returns the path to the network namespace of the sandbox.
|
||||
|
@ -418,14 +416,14 @@ func (s *Sandbox) NetNsCreate() error {
|
|||
}
|
||||
|
||||
s.netns = &NetNs{
|
||||
ns: netNS,
|
||||
nn: netNS,
|
||||
closed: false,
|
||||
}
|
||||
|
||||
if err := s.netns.symlinkCreate(s.name); err != nil {
|
||||
logrus.Warnf("Could not create nentns symlink %v", err)
|
||||
|
||||
if err1 := s.netns.ns.Close(); err1 != nil {
|
||||
if err1 := s.netns.nn.Close(); err1 != nil {
|
||||
return err1
|
||||
}
|
||||
|
||||
|
@ -485,7 +483,7 @@ func (s *Sandbox) NetNsRemove() error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := s.netns.ns.Close(); err != nil {
|
||||
if err := s.netns.nn.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -496,7 +494,7 @@ func (s *Sandbox) NetNsRemove() error {
|
|||
// /var/run/netns/cni-0d08effa-06eb-a963-f51a-e2b0eceffc5d
|
||||
// but /var/run on most system is symlinked to /run so we first resolve
|
||||
// the symlink and then try and see if it's mounted
|
||||
fp, err := symlink.FollowSymlinkInScope(s.netns.ns.Path(), "/")
|
||||
fp, err := symlink.FollowSymlinkInScope(s.netns.nn.Path(), "/")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -506,7 +504,7 @@ func (s *Sandbox) NetNsRemove() error {
|
|||
}
|
||||
}
|
||||
|
||||
if err := os.RemoveAll(s.netns.ns.Path()); err != nil {
|
||||
if err := os.RemoveAll(s.netns.nn.Path()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue