Skip to content

Commit

Permalink
Cleanup daens and veth for graceful termination
Browse files Browse the repository at this point in the history
  • Loading branch information
jschwinger233 committed Jan 11, 2024
1 parent 0e0fe1e commit 52252eb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 2 additions & 1 deletion cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,11 @@ loop:
break loop
}
}
defer os.Remove(PidFilePath)
defer control.GetDaeNetns().Close()
if e := c.Close(); e != nil {
return fmt.Errorf("close control plane: %w", e)
}
_ = os.Remove(PidFilePath)
return nil
}

Expand Down
10 changes: 10 additions & 0 deletions control/netns_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ func init() {
daeNetns = &DaeNetns{}
}

func GetDaeNetns() *DaeNetns {
return daeNetns
}

func (ns *DaeNetns) Setup() (err error) {
if ns.setupDone.Load() {
return
Expand All @@ -55,6 +59,12 @@ func (ns *DaeNetns) Setup() (err error) {
return nil
}

func (ns *DaeNetns) Close() (err error) {
DeleteNamedNetns(NsName)
DeleteLink(HostVethName)
return
}

func (ns *DaeNetns) With(f func() error) (err error) {
if err = daeNetns.Setup(); err != nil {
return fmt.Errorf("failed to setup dae netns: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion control/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func sendPkt(data []byte, from netip.AddrPort, realTo, to netip.AddrPort, lConn
WithField("to", to).
WithField("realTo", realTo).
Trace("Port in use, fallback to use netns.")
err = daeNetns.With(func() (err error) {
err = GetDaeNetns().With(func() (err error) {
uConn, _, err = DefaultAnyfromPool.GetOrCreate(from.String(), AnyfromTimeout)
return err
})
Expand Down

0 comments on commit 52252eb

Please sign in to comment.