ct sync optimizations

loxilb-io · Aug 20, 2023 · 9aaceca · 9aaceca
1 parent 7253c90
commit 9aaceca
Showing 1 changed file with 11 additions and 34 deletions.
diff --git a/loxinet/dpebpf_linux.go b/loxinet/dpebpf_linux.go
@@ -1690,32 +1690,20 @@ func dpCTMapNotifierWorker(cti *DpCtInfo) {
 
 func dpCTMapBcast() {
 	mh.dpEbpf.mtx.Lock()
-	defer mh.dpEbpf.mtx.Unlock()
-
-	var (
-		tot int
-		rok int
-	)
 
 	for _, cti := range mh.dpEbpf.ctMap {
 		if cti.Deleted <= 0 && cti.CState == "est" {
-			tot++
-			ret := mh.dp.DpXsyncRPC(DpSyncBcast, cti)
-			if ret == 0 {
-				rok++
-				cti.XSync = false
-			} else {
-				cti.XSync = true
-				cti.NTs = time.Now()
-			}
+			cti.XSync = true
 		}
 	}
-	if tot == rok {
-		cti := new(DpCtInfo)
-		cti.Proto = "xsync"
-		cti.Sport = uint16(mh.self)
-		mh.dp.DpXsyncRPC(DpSyncBcast, cti)
-	}
+
+	mh.dpEbpf.mtx.Unlock()
+
+	cti := new(DpCtInfo)
+	cti.Proto = "xsync"
+	cti.Sport = uint16(mh.self)
+	mh.dp.DpXsyncRPC(DpSyncBcast, cti)
+	tk.LogIt(tk.LogInfo, "[CT]  CTBcast Complete \n")
 }
 
 func dpCTMapChkUpdates() {
@@ -1833,7 +1821,7 @@ func dpCTMapChkUpdates() {
 			}
 		}
 
-		if len(blkCti) > 1024 {
+		if len(blkCti) > 2048 {
 			tk.LogIt(tk.LogDebug, "[CT] Block Add Sync - \n")
 			tc1 := time.Now()
 			mh.dp.DpXsyncRPC(DpSyncAdd, blkCti)
@@ -1842,7 +1830,7 @@ func dpCTMapChkUpdates() {
 			blkCti = nil
 		}
 
-		if len(blkDelCti) > 1024 {
+		if len(blkDelCti) > 2048 {
 			tk.LogIt(tk.LogDebug, "[CT] Block Del Sync - \n")
 			mh.dp.DpXsyncRPC(DpSyncDelete, blkDelCti)
 			blkDelCti = nil
@@ -1973,18 +1961,7 @@ func (e *DpEbpfH) DpCtDel(w *DpCtInfo) int {
 
 // DpCtGetAsync - routine to work on a ebpf ct get async request
 func (e *DpEbpfH) DpCtGetAsync() {
-
 	e.ctBcast <- true
-
-	//	mh.dpEbpf.mtx.Lock()
-	//	defer mh.dpEbpf.mtx.Unlock()
-
-	//	for _, cte := range mh.dpEbpf.ctMap {
-	//		if cte.CState == "est" {
-	//			cte.XSync = true
-	//			cte.NTs = time.Now()
-	//		}
-	//	}
 }
 
 // DpTakeLock - routine to take underlying DP lock