Merge pull request #461 from TrekkieCoder/main

PR : Fixes related to init sequencing
loxilb-io · Dec 11, 2023 · aadb73d · aadb73d
2 parents e159af2 + 132cb08
commit aadb73d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/api/loxinlp/nlp.go b/api/loxinlp/nlp.go
@@ -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 {
@@ -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

diff --git a/cicd/common.sh b/cicd/common.sh
@@ -152,7 +152,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