From aeebc69e4357f0496c93a2aca15bf90b2d07ed7b Mon Sep 17 00:00:00 2001 From: John Gossman Date: Sat, 11 Apr 2015 10:40:37 -0700 Subject: [PATCH] Added some error messages and tracing to bridge network initialization Signed-off-by: John Gossman Upstream-commit: a9843cb739bd30a9e6eeb8841f645008e1fc905f Component: engine --- components/engine/daemon/daemon.go | 1 + components/engine/daemon/networkdriver/bridge/driver.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/components/engine/daemon/daemon.go b/components/engine/daemon/daemon.go index 86ed71e231..1acf96a023 100644 --- a/components/engine/daemon/daemon.go +++ b/components/engine/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 } } diff --git a/components/engine/daemon/networkdriver/bridge/driver.go b/components/engine/daemon/networkdriver/bridge/driver.go index dabb1165e7..d9698382e0 100644 --- a/components/engine/daemon/networkdriver/bridge/driver.go +++ b/components/engine/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