gh-87: SCTP-MH fixed

loxilb-io · Dec 5, 2024 · 8bd2bd9 · 8bd2bd9
1 parent ae6d480
commit 8bd2bd9
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 42 deletions.
diff --git a/cicd/sctpmh/check_ha.sh b/cicd/sctpmh/check_ha.sh
@@ -80,12 +80,15 @@ function restart_mloxilb() {
         ka=" --ka=172.17.0.2:172.17.0.3"
     fi
     echo "Restarting MASTER: $master"
-    pid=$(docker exec -i $master ps -aef | grep $pat | xargs | cut -d ' ' -f 2)
+    #pid=$(docker exec -i $master ps -aef | grep $pat | xargs | cut -d ' ' -f 2)
+    pid=$(ps -aef | grep $pat | xargs | cut -d ' ' -f 2)
     echo "Killing $pid" >&2
-    docker exec -dt $master kill -9 $pid
+    #docker exec -dt $master kill -9 $pid
+    sudo kill -9 $pid
     docker exec -dt $master ip link del llb0
-    docker exec -dt $master nohup /root/loxilb-io/loxilb/loxilb $copts $self $ka > /dev/null &
-    pid=$(docker exec -i $master ps -aef | grep $pat | xargs | cut -d ' ' -f 2)
+    docker exec -dt $master /root/loxilb-io/loxilb/loxilb $copts $self $ka
+    #pid=$(docker exec -i $master ps -aef | grep $pat | xargs | cut -d ' ' -f 2)
+    pid=$(ps -aef | grep $pat | xargs | cut -d ' ' -f 2)
     echo "New loxilb pid: $pid" >&2
 }
 
@@ -112,23 +115,30 @@ function restart_loxilbs() {
         bka=" --ka=172.17.0.3:172.17.0.2"
     fi
     echo "Restarting $master"
-    pid=$(docker exec -i $master ps -aef | grep $mpat | xargs | cut -d ' ' -f 2)
-    echo "Killing $mpid" >&2
-    docker exec -dt $master kill -9 $pid
+    pid=$(ps -aef | grep $mpat | xargs | cut -d ' ' -f 2)
+    #pid=$(docker exec -i $master ps -aef | grep $mpat | xargs | cut -d ' ' -f 2)
+    echo "Killing $pid" >&2
+    #docker exec -dt $master kill -9 $pid
+    sudo kill -9 $pid
     docker exec -dt $master ip link del llb0
-    docker exec -dt $master nohup /root/loxilb-io/loxilb/loxilb $mcopts $mself $mka > /dev/null &
-    pid=$(docker exec -i $master ps -aef | grep $mpat | xargs | cut -d ' ' -f 2)
+    echo "/root/loxilb-io/loxilb/loxilb $mcopts $mself $mka" >&2
+    docker exec -dt $master /root/loxilb-io/loxilb/loxilb $mcopts $mself $mka
+    pid=$(ps -aef | grep $mpat | xargs | cut -d ' ' -f 2)
+    #pid=$(docker exec -i $master ps -aef | grep $mpat | xargs | cut -d ' ' -f 2)
     echo "New loxilb pid: $pid" >&2
 
     echo "Restarting $backup"
-    pid=$(docker exec -i $backup ps -aef | grep $bpat | xargs | cut -d ' ' -f 2)
+    pid=$(ps -aef | grep $bpat | xargs | cut -d ' ' -f 2)
+    #pid=$(docker exec -i $backup ps -aef | grep $bpat | xargs | cut -d ' ' -f 2)
     echo "Killing $pid" >&2
-    docker exec -dt $backup kill -9 $pid
+    #docker exec -dt $backup kill -9 $pid
+    sudo kill -9 $pid
     docker exec -dt $backup ip link del llb0
-    docker exec -dt $backup nohup /root/loxilb-io/loxilb/loxilb $bcopts $bself $bka > /dev/null &
-    pid=$(docker exec -i $backup ps -aef | grep $bpat | xargs | cut -d ' ' -f 2)
+    echo "/root/loxilb-io/loxilb/loxilb $bcopts $bself $bka" >&2
+    docker exec -dt $backup /root/loxilb-io/loxilb/loxilb $bcopts $bself $bka
+    #pid=$(docker exec -i $backup ps -aef | grep $bpat | xargs | cut -d ' ' -f 2)
+    pid=$(ps -aef | grep $bpat | xargs | cut -d ' ' -f 2)
     echo "New loxilb pid: $pid" >&2
-
 }
 
 
diff --git a/cicd/sctpmh/config.sh b/cicd/sctpmh/config.sh
@@ -5,7 +5,7 @@ source ../common.sh
 echo "#########################################"
 echo "Spawning all hosts"
 echo "#########################################"
-
+sudo sysctl net.ipv4.conf.all.arp_accept=1
 spawn_docker_host --dock-type loxilb --dock-name llb1 --with-ka in
 spawn_docker_host --dock-type loxilb --dock-name llb2 --with-ka in
 spawn_docker_host --dock-type host --dock-name ep1

diff --git a/cicd/sctpmh/validation.sh b/cicd/sctpmh/validation.sh
@@ -22,7 +22,7 @@ for((j=0,i=1; i<=6; i++, j++)); do
     fi
     echo -e "\n\n\n$border\n\n"
 
-    sleep 30
+    sleep 60
 done
 
 echo -e "\n\n\n$border\n"

diff --git a/cicd/sctpmh/validation2.sh b/cicd/sctpmh/validation2.sh
@@ -34,9 +34,9 @@ for((i=0;i<100;i++)) do
     fi
     $dexec $master loxicmd get ct --servName=sctpmh1
     echo -e "\n"
-    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
-    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "124.124.124.1 | 2.2.2.1" | xargs | cut -d '|' -f 10)
-    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "125.125.125.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
+    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
+    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "124.124.124.1 | 2.2.2.1" | xargs | cut -d '|' -f 11)
+    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "125.125.125.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
 
     echo "Counters: $p1c_new $p2c_new $p3c_new"
 

diff --git a/cicd/sctpmh/validation3.sh b/cicd/sctpmh/validation3.sh
@@ -18,7 +18,7 @@ echo -e "\nTraffic Flow: User -> LB -> EP "
 $hexec ep1 sctp_test -H 31.31.31.1  -P 9999 -l > ep1.out &
 sleep 2
 
-$hexec user stdbuf -oL sctp_test -H 1.1.1.1 -B 2.2.2.1 -P 20000 -h $extIP -p $port -s -c 6 -x 1000 > user.out &
+$hexec user stdbuf -oL sctp_test -H 1.1.1.1 -B 2.2.2.1 -P 20000 -h $extIP -p $port -s -c 6 -x 5000 > user.out &
 #Path counters
 p1c_old=0
 p1c_new=0
@@ -32,17 +32,17 @@ code=0
 sleep 5
 
 for((i=0;i<200;i++)) do
-    fin=`tail -n 100 user.out | grep "Client: Sending packets.(1000/1000)"`
+    fin=`tail -n 100 user.out | grep "Client: Sending packets.(5000/5000)"`
     if [[ ! -z $fin ]]; then
         fin=1
         echo "sctp_test done."
         break;
     fi
     $dexec $master loxicmd get ct --servName=sctpmh1 
     echo -e "\n"
-    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
-    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "124.124.124.1 | 2.2.2.1" | xargs | cut -d '|' -f 10)
-    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "125.125.125.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
+    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
+    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "124.124.124.1 | 2.2.2.1" | xargs | cut -d '|' -f 11)
+    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "125.125.125.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
 
     echo "Counters: $p1c_new $p2c_new $p3c_new"
 
@@ -56,7 +56,7 @@ for((i=0;i<200;i++)) do
         echo "Turning off this path from User->LB"
         $hexec user ip link set euserr1 down;
         down=1
-        p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
+        p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
     else
         if [[ $down == 1 ]]; then
             p1dok=1

diff --git a/cicd/sctpmh/validation4.sh b/cicd/sctpmh/validation4.sh
@@ -16,7 +16,7 @@ echo -e "\nTraffic Flow: EP ---> LB ---> User"
 $hexec user sctp_test -H 0.0.0.0  -P 9999 -l > user.out &
 sleep 2
 
-$hexec ep1 stdbuf -oL sctp_test -H 31.31.31.1 -B 32.32.32.1 -P 20000 -h $extIP -p $port -s -c 6 -x 1000 > ep1.out &
+$hexec ep1 stdbuf -oL sctp_test -H 31.31.31.1 -B 32.32.32.1 -P 20000 -h $extIP -p $port -s -c 6 -x 5000 > ep1.out &
 
 #Path counters
 p1c_old=0
@@ -30,17 +30,17 @@ code=0
 sleep 2
 
 for((i=0;i<200;i++)) do
-    fin=`tail -n 100 ep1.out | grep "Client: Sending packets.(1000/1000)"`
+    fin=`tail -n 100 ep1.out | grep "Client: Sending packets.(5000/5000)"`
     if [[ ! -z $fin ]]; then
         fin=1
         echo "sctp_test done."
         break;
     fi
     $dexec $master loxicmd get ct --servName=sctpmh2
     echo -e "\n"
-    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "133.133.133.1 | 31.31.31.1" | xargs | cut -d '|' -f 10)
-    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "134.134.134.1 | 32.32.32.1" | xargs | cut -d '|' -f 10)
-    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "135.135.135.1 | 31.31.31.1" | xargs | cut -d '|' -f 10)
+    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "133.133.133.1 | 31.31.31.1" | xargs | cut -d '|' -f 11)
+    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "134.134.134.1 | 32.32.32.1" | xargs | cut -d '|' -f 11)
+    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "135.135.135.1 | 31.31.31.1" | xargs | cut -d '|' -f 11)
 
     echo "Counters: $p1c_new $p2c_new $p3c_new"
 
@@ -54,7 +54,7 @@ for((i=0;i<200;i++)) do
         echo -e "Turning off this path at User.\nEP----->LB--x-->User"
         $hexec user ip link set euserr1 down;
         down=1
-        p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "133.133.133.1 | 31.31.31.1" | xargs | cut -d '|' -f 10)
+        p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "133.133.133.1 | 31.31.31.1" | xargs | cut -d '|' -f 11)
     else
         if [[ $down == 1 ]]; then
             p1dok=1

diff --git a/cicd/sctpmh/validation5.sh b/cicd/sctpmh/validation5.sh
@@ -19,7 +19,7 @@ sudo pkill sctp_test
 $hexec ep1 sctp_test -H 31.31.31.1  -P 9999 -l > ep1.out &
 sleep 2
 
-$hexec user stdbuf -oL sctp_test -H 1.1.1.1 -B 2.2.2.1 -P 20000 -h $extIP -p $port -s -c 6 -x 10000 > user.out &
+$hexec user stdbuf -oL sctp_test -H 1.1.1.1 -B 2.2.2.1 -P 20000 -h $extIP -p $port -s -c 6 -x 30000 > user.out &
 
 #Path counters
 p1c_old=0
@@ -34,7 +34,7 @@ code=0
 nsyncOk=0
 
 for((i=0;i<400;i++)) do
-    fin=`tail -n 100 user.out | grep "Client: Sending packets.(10000/10000)"`
+    fin=`tail -n 100 user.out | grep "Client: Sending packets.(30000/30000)"`
     if [[ ! -z $fin ]]; then
         fin=1
         echo "sctp_test done."
@@ -51,9 +51,9 @@ for((i=0;i<400;i++)) do
     fi
     $dexec $master loxicmd get ct --servName=sctpmh1 
     echo -e "\n"
-    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
-    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "124.124.124.1 | 2.2.2.1" | xargs | cut -d '|' -f 10)
-    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "125.125.125.1 | 1.1.1.1" | xargs | cut -d '|' -f 10)
+    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "123.123.123.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
+    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "124.124.124.1 | 2.2.2.1" | xargs | cut -d '|' -f 11)
+    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh1 | grep "125.125.125.1 | 1.1.1.1" | xargs | cut -d '|' -f 11)
 
     echo "Counters: $p1c_new $p2c_new $p3c_new"
     if [[ $p1c_new -gt $p1c_old ]]; then

diff --git a/cicd/sctpmh/validation6.sh b/cicd/sctpmh/validation6.sh
@@ -21,7 +21,7 @@ sudo pkill sctp_test
 $hexec user sctp_test -H 0.0.0.0  -P 9999 -l > user.out &
 sleep 2
 
-$hexec ep1 stdbuf -oL sctp_test -H 31.31.31.1 -B 32.32.32.1 -P 20000 -h $extIP -p $port -s -c 6 -x 10000 > ep1.out &
+$hexec ep1 stdbuf -oL sctp_test -H 31.31.31.1 -B 32.32.32.1 -P 20000 -h $extIP -p $port -s -c 6 -x 30000 > ep1.out &
 
 #Path counters
 p1c_old=0
@@ -36,7 +36,7 @@ code=0
 nsyncOk=0
 
 for((i=0;i<500;i++)) do
-    fin=`tail -n 100 ep1.out | grep "Client: Sending packets.(10000/10000)"`
+    fin=`tail -n 100 ep1.out | grep "Client: Sending packets.(30000/30000)"`
     if [[ ! -z $fin ]]; then
         fin=1
         echo "sctp_test done."
@@ -55,9 +55,9 @@ for((i=0;i<500;i++)) do
     echo -e "\n"
     $dexec $master loxicmd get ct --servName=sctpmh2
     echo -e "\n"
-    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "133.133.133.1 | 31.31.31.1" | xargs | cut -d '|' -f 10)
-    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "134.134.134.1 | 32.32.32.1" | xargs | cut -d '|' -f 10)
-    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "135.135.135.1 | 31.31.31.1" | xargs | cut -d '|' -f 10)
+    p1c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "133.133.133.1 | 31.31.31.1" | xargs | cut -d '|' -f 11)
+    p2c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "134.134.134.1 | 32.32.32.1" | xargs | cut -d '|' -f 11)
+    p3c_new=$(sudo docker exec -i $master loxicmd get ct --servName=sctpmh2 | grep "135.135.135.1 | 31.31.31.1" | xargs | cut -d '|' -f 11)
 
 
     echo "Counters: $p1c_new $p2c_new $p3c_new"
@@ -102,7 +102,7 @@ done
 sudo rm -rf *.out
 sudo pkill sctp_test
 
-if [[ $fin == 1 && $p1 == 1 && $p2 == 1 && $p3 == 1 && $code == 0 && $nsyncOk == 1 ]]; then
+if [[ $fin == 1 && $p1 == 1 && $p2 == 1 && $p3 == 1 && $code == 0 && $syncOk == 1 ]]; then
     echo "sctpmh SCTP Multihoming E2E HA Failover [OK]"
     echo "OK" > status6.txt
     restart_loxilbs