Browse code

Added some error messages and tracing to bridge network initialization

Signed-off-by: John Gossman <johngos@microsoft.com>

John Gossman authored on 2015/04/12 02:40:37
Showing 2 changed files
... ...
@@ -938,6 +938,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService
938 938
 
939 939
 	if !config.DisableNetwork {
940 940
 		if err := bridge.InitDriver(&config.Bridge); err != nil {
941
+			logrus.Errorf("Error initializing Bridge: %s", err)
941 942
 			return nil, err
942 943
 		}
943 944
 	}
... ...
@@ -135,8 +135,11 @@ func InitDriver(config *Config) error {
135 135
 			return err
136 136
 		}
137 137
 
138
+		logrus.Infof("Bridge interface not found, trying to create it")
139
+
138 140
 		// If the iface is not found, try to create it
139 141
 		if err := configureBridge(config.IP, bridgeIPv6, config.EnableIPv6); err != nil {
142
+			logrus.Errorf("Could not configure Bridge: %s", err)
140 143
 			return err
141 144
 		}
142 145
 
... ...
@@ -214,6 +217,7 @@ func InitDriver(config *Config) error {
214 214
 	// Configure iptables for link support
215 215
 	if config.EnableIptables {
216 216
 		if err := setupIPTables(addrv4, config.InterContainerCommunication, config.EnableIpMasq); err != nil {
217
+			logrus.Errorf("Error configuing iptables: %s", err)
217 218
 			return err
218 219
 		}
219 220
 
... ...
@@ -261,6 +265,7 @@ func InitDriver(config *Config) error {
261 261
 		}
262 262
 		logrus.Debugf("Subnet: %v", subnet)
263 263
 		if err := ipAllocator.RegisterSubnet(bridgeIPv4Network, subnet); err != nil {
264
+			logrus.Errorf("Error registering subnet for IPv4 bridge network: %s", err)
264 265
 			return err
265 266
 		}
266 267
 	}
... ...
@@ -272,6 +277,7 @@ func InitDriver(config *Config) error {
272 272
 		}
273 273
 		logrus.Debugf("Subnet: %v", subnet)
274 274
 		if err := ipAllocator.RegisterSubnet(subnet, subnet); err != nil {
275
+			logrus.Errorf("Error registering subnet for IPv4 bridge network: %s", err)
275 276
 			return err
276 277
 		}
277 278
 		globalIPv6Network = subnet