jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add loop for veth pair creation on ErrInterfaceExists 

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2014-10-02 22:03:25 +00:00
parent 255989b835
commit b9d08491f6
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
network/veth.go
View File

@ -5,6 +5,7 @@ package network
import (
"fmt"
"github.com/docker/libcontainer/netlink"
"github.com/docker/libcontainer/utils"
)
@ -96,16 +97,24 @@ func (v *Veth) Initialize(config *Network, networkState *NetworkState) error {
// createVethPair will automatically generage two random names for
// the veth pair and ensure that they have been created
func createVethPair(prefix string) (name1 string, name2 string, err error) {
if name1, err = utils.GenerateRandomName(prefix, 7); err != nil {
return
}
for i := 0; i < 10; i++ {
if name1, err = utils.GenerateRandomName(prefix, 7); err != nil {
return
}
if name2, err = utils.GenerateRandomName(prefix, 7); err != nil {
return
}
if name2, err = utils.GenerateRandomName(prefix, 7); err != nil {
return
}
if err = CreateVethPair(name1, name2); err != nil {
return
if err = CreateVethPair(name1, name2); err != nil {
if err == netlink.ErrInterfaceExists {
continue
}
return
}
break
}
return