Explorar o código

Merge pull request #1418 from sanimej/vxlan

Propage the vxlan device creation error in driver to libnetwork
Jana Radhakrishnan %!s(int64=9) %!d(string=hai) anos
pai
achega
e7d84635f2
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      libnetwork/drivers/overlay/ov_network.go

+ 6 - 2
libnetwork/drivers/overlay/ov_network.go

@@ -500,9 +500,13 @@ func (n *network) initSubnetSandbox(s *subnet, restore bool) error {
 	vxlanName := n.generateVxlanName(s)
 
 	if restore {
-		n.restoreSubnetSandbox(s, brName, vxlanName)
+		if err := n.restoreSubnetSandbox(s, brName, vxlanName); err != nil {
+			return err
+		}
 	} else {
-		n.setupSubnetSandbox(s, brName, vxlanName)
+		if err := n.setupSubnetSandbox(s, brName, vxlanName); err != nil {
+			return err
+		}
 	}
 
 	n.Lock()