Control concurrency using sync.Mutex

control/netns_utils.go

@@ -26,7 +26,7 @@ var (
 )
 
 type DaeNetns struct {
-	once sync.Once
+	mu sync.Mutex
 
 	dae0, dae0peer netlink.Link
 	hostNs, daeNs  netns.NsHandle
@@ -41,11 +41,15 @@ func (ns *DaeNetns) Setup() (err error) {
 		return nil
 	}
 
-	ns.once.Do(func() {
-		if err = ns.setup(); err != nil {
-			logrus.Fatal("Failed to setup dae netns: %v", err)
-		}
-	})
+	ns.mu.Lock()
+	defer ns.mu.Unlock()
+	if ns.daeNs != 0 && ns.hostNs != 0 {
+		return nil
+	}
+	if err = ns.setup(); err != nil {
+		ns.daeNs = 0
+		ns.hostNs = 0
+	}
 	return err
 }