Procházet zdrojové kódy

Added some error messages and tracing to bridge network initialization

Signed-off-by: John Gossman <johngos@microsoft.com>
John Gossman před 10 roky
rodič
revize
a9843cb739
2 změnil soubory, kde provedl 7 přidání a 0 odebrání
  1. 1 0
      daemon/daemon.go
  2. 6 0
      daemon/networkdriver/bridge/driver.go

+ 1 - 0
daemon/daemon.go

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

+ 6 - 0
daemon/networkdriver/bridge/driver.go

@@ -135,8 +135,11 @@ func InitDriver(config *Config) error {
 			return err
 		}
 
+		logrus.Infof("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 IPv4 bridge network: %s", err)
 			return err
 		}
 		globalIPv6Network = subnet