Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR : Fixes related to init sequencing #461

Merged
merged 4 commits into from
Dec 11, 2023
Merged

PR : Fixes related to init sequencing #461

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a599da1
Fixed perfCI regressions temporarily due to incomplete merge
TrekkieCoder Dec 11, 2023
bb78147
Merge branch 'main' of https://github.com/TrekkieCoder/loxilb into main
TrekkieCoder Dec 11, 2023
6191779
Merge branch 'main' of https://github.com/TrekkieCoder/loxilb into main
TrekkieCoder Dec 11, 2023
132cb08
removed shell var needed by perfCI as it is no longer needed
TrekkieCoder Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/loxinlp/nlp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,8 +1551,6 @@ func NlpInit(bgpPeerMode bool, blackList string) *NlH {
nNl.IMap = make(map[string]Intf)

checkInit := make(chan bool)
go NlpGet(checkInit)
done := <-checkInit

err := nlp.LinkSubscribe(nNl.FromLUCh, nNl.FromLUDone)
if err != nil {
Expand Down Expand Up @@ -1582,6 +1580,9 @@ func NlpInit(bgpPeerMode bool, blackList string) *NlH {
go NLWorker(nNl, bgpPeerMode)
tk.LogIt(tk.LogInfo, "[NLP] NLP Subscription done\n")

go NlpGet(checkInit)
done := <-checkInit

go LbSessionGet(done)

return nNl
Expand Down
6 changes: 5 additions & 1 deletion cicd/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ hns="sudo ip netns "
hexist="$vrn$hn"
lxdocker="ghcr.io/loxilb-io/loxilb:latest"
cluster_opts=""
## FIXME - This is needed for perfCI scripts
OSE_LOXILB_SERVERS=${OSE_LOXILB_SERVERS:=1}
TrekkieCoder marked this conversation as resolved.
Show resolved Hide resolved
var=$(lsb_release -r | cut -f2)
if [[ $var == *"22.04"* ]];then
lxdocker="ghcr.io/loxilb-io/loxilb:latestu22"
Expand Down Expand Up @@ -152,7 +154,9 @@ spawn_docker_host() {
$hexec $dname ifconfig lo up
$hexec $dname sysctl net.ipv6.conf.all.disable_ipv6=1 2>&1 >> /dev/null
#$hexec $dname sysctl net.ipv4.conf.all.arp_accept=1 2>&1 >> /dev/null
$hexec $dname sysctl net.ipv4.conf.eth0.arp_ignore=2 2>&1 >> /dev/null
if [ -f /proc/sys/net/ipv4/conf/eth0/arp_ignore ]; then
$hexec $dname sysctl net.ipv4.conf.eth0.arp_ignore=2 2>&1 >> /dev/null
fi
}

## Get loxilb peer docker IP
Expand Down
Loading