Merge pull request #12300 from johngossman/master

Added some error messages and tracing to bridge network initialization
Upstream-commit: 3434f64827dc5e69afa7161a9da24a9117e7990a
Component: engine

components/engine/daemon/daemon.go

@@ -932,7 +932,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService
 
 	if !config.DisableNetwork {
 		if err := bridge.InitDriver(&config.Bridge); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error initializing Bridge: %v", err)
 		}
 	}
 

components/engine/daemon/networkdriver/bridge/driver.go

@@ -135,8 +135,11 @@ func InitDriver(config *Config) error {
 			return err
 		}
 
+		logrus.Info("Bridge interface not found, trying to create it")
+
 		// If the iface is not found, try to create it
 		if err := configureBridge(config.IP, bridgeIPv6, config.EnableIPv6); err != nil {
+			logrus.Errorf("Could not configure Bridge: %s", err)
 			return err
 		}
 
@@ -214,6 +217,7 @@ func InitDriver(config *Config) error {
 	// Configure iptables for link support
 	if config.EnableIptables {
 		if err := setupIPTables(addrv4, config.InterContainerCommunication, config.EnableIpMasq); err != nil {
+			logrus.Errorf("Error configuing iptables: %s", err)
 			return err
 		}
 
@@ -261,6 +265,7 @@ func InitDriver(config *Config) error {
 		}
 		logrus.Debugf("Subnet: %v", subnet)
 		if err := ipAllocator.RegisterSubnet(bridgeIPv4Network, subnet); err != nil {
+			logrus.Errorf("Error registering subnet for IPv4 bridge network: %s", err)
 			return err
 		}
 	}
@@ -272,6 +277,7 @@ func InitDriver(config *Config) error {
 		}
 		logrus.Debugf("Subnet: %v", subnet)
 		if err := ipAllocator.RegisterSubnet(subnet, subnet); err != nil {
+			logrus.Errorf("Error registering subnet for IPv6 bridge network: %s", err)
 			return err
 		}
 		globalIPv6Network = subnet