From 9e1b459272c422d034d7bc13bad9aca477d3bf5c Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 10 Jan 2025 19:50:13 +0900 Subject: [PATCH 1/5] ct garbage handling fixes --- loxilb-ebpf | 2 +- pkg/loxinet/dpebpf_linux.go | 4 ++-- pkg/loxinet/rules.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index 0891900b..bf245ce9 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 0891900bc589555239c6020b9d26e886c4e8b80c +Subproject commit bf245ce96e028e21ad95b10bd716b6c8e0c844f3 diff --git a/pkg/loxinet/dpebpf_linux.go b/pkg/loxinet/dpebpf_linux.go index 40e82308..618532ab 100644 --- 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 index fe0c323f..c9f4304d 100644 --- 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 From 13cc9f6eef1e9fb8e9f98f2ce13e190e8355f73f Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 10 Jan 2025 22:23:14 +0900 Subject: [PATCH 2/5] cicd: handle upto 32 eps --- cicd/wrrtcplb1/validation.sh | 9 ++++----- cicd/wrrtcplb2/validation.sh | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cicd/wrrtcplb1/validation.sh b/cicd/wrrtcplb1/validation.sh index 367dde4b..92ad3908 100755 --- 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 index f1c292f4..1e8383b0 100755 --- 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 From ccd7660a3c537d2a21775ccf770cbb3f48c585fc Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Sat, 11 Jan 2025 00:36:07 +0900 Subject: [PATCH 3/5] ct garbage handling fixes --- loxilb-ebpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index bf245ce9..4fff6e4a 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit bf245ce96e028e21ad95b10bd716b6c8e0c844f3 +Subproject commit 4fff6e4a696f8ffa16ceb45ccff9b292f2fe1585 From 7241f7225d54c20bc67dfcdf9073c5d27b5c0706 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Sat, 11 Jan 2025 16:54:37 +0900 Subject: [PATCH 4/5] cicd: fixed typos in script --- .github/workflows/basic-sanity-ubuntu-22.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml index 943adb4a..5d54485b 100644 --- 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 From e19957ba4aab49d6c9e1ce27e3f675778a1b0e41 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Sat, 11 Jan 2025 17:04:17 +0900 Subject: [PATCH 5/5] cicd: fixed typos in script --- .github/workflows/tcp-sanity-ubuntu-22.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml index 29720fd2..744c14e1 100644 --- 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