Merge pull request #349 from TrekkieCoder/main

PR : Graceful handling on SIGTERM and SIGINT (#348)

loxinet/dpebpf_linux.go

@@ -286,6 +286,34 @@ func DpEbpfInit(clusterEn bool, nodeNum int, rssEn bool, logLevel tk.LogLevelT)
  return ne
 }
 
+// DpEbpfUnInit - uninitialize the ebpf dp subsystem
+func (e *DpEbpfH) DpEbpfUnInit() {
+
+ e.tDone <- true
+ e.ToFinCh <- 1
+
+ // Make sure to unload eBPF programs
+ ifList, err := net.Interfaces()
+ if err != nil {
+ return
+ }
+
+ for _, intf := range ifList {
+
+ tk.LogIt(tk.LogInfo, "ebpf unload - %s\n", intf.Name)
+ ifStr := C.CString(intf.Name)
+ section := C.CString(string(C.TC_LL_SEC_DEFAULT))
+ if e.RssEn {
+ xSection := C.CString(string(C.XDP_LL_SEC_DEFAULT))
+ C.llb_dp_link_attach(ifStr, xSection, C.LL_BPF_MOUNT_XDP, 1)
+ C.free(unsafe.Pointer(xSection))
+ }
+ C.llb_dp_link_attach(ifStr, section, C.LL_BPF_MOUNT_TC, 1)
+ C.free(unsafe.Pointer(ifStr))
+ C.free(unsafe.Pointer(section))
+ }
+}
+
 func convNetIP2DPv6Addr(addr unsafe.Pointer, goIP net.IP) {
  aPtr := (*C.uchar)(addr)
  for bp := 0; bp < 16; bp++ {

loxinet/loxinet.go

@@ -22,6 +22,7 @@ import (
  apiserver "github.com/loxilb-io/loxilb/api"
  nlp "github.com/loxilb-io/loxilb/api/loxinlp"
  prometheus "github.com/loxilb-io/loxilb/api/prometheus"
+ restapi "github.com/loxilb-io/loxilb/api/restapi"
  cmn "github.com/loxilb-io/loxilb/common"
  opts "github.com/loxilb-io/loxilb/options"
  tk "github.com/loxilb-io/loxilib"
@@ -179,8 +180,12 @@ func loxiNetTicker() {
  try++
  }
  } else if sig == syscall.SIGHUP {
- fmt.Printf("SIGHUP called\n")
+ tk.LogIt(tk.LogCritical, "SIGHUP received\n")
  pprof.StopCPUProfile()
+ } else if sig == syscall.SIGINT || sig == syscall.SIGTERM {
+ tk.LogIt(tk.LogCritical, "Shutdown on sig %v\n", sig)
+ mh.dpEbpf.DpEbpfUnInit()
+ restapi.ServerSigShutOk()
  }
  case t := <-mh.ticker.C:
  tk.LogIt(-1, "Tick at %v\n", t)
@@ -225,8 +230,7 @@ func loxiNetInit() {
  mh.sumDis = opts.Opts.CSumDisable
  mh.pProbe = opts.Opts.PassiveEPProbe
  mh.sigCh = make(chan os.Signal, 5)
- signal.Notify(mh.sigCh, os.Interrupt, syscall.SIGCHLD)
- signal.Notify(mh.sigCh, os.Interrupt, syscall.SIGHUP)
+ signal.Notify(mh.sigCh, os.Interrupt, syscall.SIGCHLD, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM)
 
  // Check if profiling is enabled
  if opts.Opts.CPUProfile != "none" {