Merge pull request #929 from TrekkieCoder/main

PR - Handling of priority items on SIGTERM
loxilb-io · Jan 11, 2025 · 95a4275 · 95a4275
2 parents 6942479 + 41a04be
commit 95a4275
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/pkg/loxinet/loxinet.go b/pkg/loxinet/loxinet.go
@@ -167,6 +167,9 @@ func loxiNetTicker(bgpPeerMode bool) {
 				pprof.StopCPUProfile()
 			} else if sig == syscall.SIGINT || sig == syscall.SIGTERM {
 				tk.LogIt(tk.LogCritical, "Shutdown on sig %v\n", sig)
+				if !bgpPeerMode {
+					mh.dpEbpf.DpEbpfUnInit()
+				}
 				// TODO - More subsystem cleanup TBD
 				mh.zr.Rules.RuleDestructAll()
 				if mh.cloudHook != nil {
@@ -188,9 +191,6 @@ func loxiNetTicker(bgpPeerMode bool) {
 						}
 					}
 				}
-				if !bgpPeerMode {
-					mh.dpEbpf.DpEbpfUnInit()
-				}
 				mh.has.CIDestroy()
 				apiserver.ApiServerShutOk()
 			}
+6 −4		common/llb_dpapi.h
+23 −0		kernel/llb_kern_ct.c
+6 −4		kernel/llb_kern_fcfwd.c
+36 −3		kernel/loxilb_libdp.c