Merge pull request #928 from TrekkieCoder/main

PR - ct garbage collection fixes
loxilb-io · Jan 11, 2025 · 6942479 · 6942479
2 parents e50e998 + e19957b
commit 6942479
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml
@@ -44,7 +44,7 @@ jobs:
       - run: sudo -E env "PATH=$PATH" make test
       - run: for iface in $(ls /sys/class/net); do sudo tc filter delete dev $iface ingress >> /dev/null 2>&1 | true; sudo tc filter delete dev $iface egress >> /dev/null 2>&1 | true; done
       - run: docker pull ghcr.io/loxilb-io/loxilb:latest
-      - run: docker run -u root --cap-add SYS_ADMIN   --restart unless-stopped --privileged -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latest-amd64
+      - run: docker run -u root --cap-add SYS_ADMIN   --restart unless-stopped --privileged -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latest
       - run: pwd && ls && sudo -E env "PATH=$PATH" make docker-cp-ebpf
       - run: docker exec -dit loxilb mkllb_bpffs
       - run: id=`docker ps -f name=loxilb | cut  -d " "  -f 1 | grep -iv  "CONTAINER"` && docker commit $id ghcr.io/loxilb-io/loxilb:latest

diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml
@@ -32,7 +32,7 @@ jobs:
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: docker pull ghcr.io/loxilb-io/loxilb:latest
-      - run: docker run -u root --cap-add SYS_ADMIN   --restart unless-stopped --privileged -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latestu22
+      - run: docker run -u root --cap-add SYS_ADMIN   --restart unless-stopped --privileged -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latest
       - run: pwd && ls && sudo -E env "PATH=$PATH" make docker-cp-ebpf
       - run: docker exec -dit loxilb mkllb_bpffs
       - run: id=`docker ps -f name=loxilb | cut  -d " "  -f 1 | grep -iv  "CONTAINER"` && docker commit $id ghcr.io/loxilb-io/loxilb:latest

diff --git a/cicd/wrrtcplb1/validation.sh b/cicd/wrrtcplb1/validation.sh
@@ -39,14 +39,13 @@ respArr=( "server1" "server1" "server1"
           "server1" "server1" "server1"
           "server1" "server1" "server1"
           "server1" "server1" "server1"
-          "server1" "server2" "server2"
-          "server2" "server2" "server1"
+          "server1" "server1" "server1"
+          "server1" "server1" "server1"
           "server1" "server2" "server2"
           "server2" "server2" "server2"
-          "server2" "server1"
-        )
+          "server2" "server1" )
 
-for i in {0..23}
+for i in {0..31}
 do
     res=$($hexec l3h1 curl --max-time 10 -s 20.20.20.1:2020)
     echo $i:$res

diff --git a/cicd/wrrtcplb2/validation.sh b/cicd/wrrtcplb2/validation.sh
@@ -36,16 +36,17 @@ done
 respArr=( "server1" "server1" "server1"
           "server1" "server1" "server1"
           "server1" "server1" "server1"
+          "server1" "server1" "server1"
+          "server2" "server2" "server2"
           "server2" "server2" "server2"
           "server2" "server2" "server2"
           "server2" "server2" "server2"
           "server3" "server3" "server3"
-          "server3" "server1" "server1"
-          "server1" "server3" "server3"
+          "server3" "server3" "server3"
           "server1" "server1"
-        )
+         )
 
-for i in {0..23}
+for i in {0..31}
 do
     res=$($hexec l3h1 curl --max-time 10 -s 20.20.20.1:2020)
     echo $i:$res

diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/pkg/loxinet/dpebpf_linux.go b/pkg/loxinet/dpebpf_linux.go
@@ -99,8 +99,8 @@ const (
 
 // constants
 const (
-	dpEbpfLinuxTiVal     = 10
-	ctGCTiValDefault     = 25
+	dpEbpfLinuxTiVal     = 5
+	ctGCTiValDefault     = 15
 	ctiDeleteSyncRetries = 3
 	blkCtiMaxLen         = 8192
 	mapNotifierChLen     = 8096

diff --git a/pkg/loxinet/rules.go b/pkg/loxinet/rules.go
@@ -78,7 +78,7 @@ const (
 
 // constants
 const (
-	MaxLBEndPoints             = 24
+	MaxLBEndPoints             = 32
 	DflLbaInactiveTries        = 2          // Default number of inactive tries before LB arm is turned off
 	MaxDflLbaInactiveTries     = 100        // Max number of inactive tries before LB arm is turned off
 	DflLbaCheckTimeout         = 10         // Default timeout for checking LB arms
+1 −1		common/llb_dpapi.h
+12 −11		kernel/llb_kern_ct.c
+9 −0		kernel/loxilb_libdp.c