Merge branch 'defOsSbox' into 'huawei-1.11.2'

initialize defOsSbox in controller New()

This will initialize defOsSbox once controller is set.
It's a workaround to prevent problems described in
moby/libnetwork#1113
from happenning.

This issue has potential risk to create defOsSbox right on a
none-host namespace thread. thus all containers created with
--net=host won't work as expected. as defOsSbox has been bind to
a container network namespace

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>



See merge request docker/docker!617

vendor/src/github.com/docker/libnetwork/controller.go

@@ -195,6 +195,15 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {
 		return nil, err
 	}
 
+	var err error
+	c.sboxOnce.Do(func() {
+		c.defOsSbox, err = osl.NewSandbox(osl.GenerateKey("default"), false, false)
+	})
+	if err != nil {
+		c.sboxOnce = sync.Once{}
+		log.Warnf("failed to create default sandbox in controller initializing: %v", err)
+	}
+
 	return c, nil
 }
 
@@ -696,6 +705,8 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (S
 	}
 
 	if sb.config.useDefaultSandBox {
+		// these code should never be called because we will
+		// create defOsSbox in libnetwork.New() once for all
 		c.sboxOnce.Do(func() {
 			c.defOsSbox, err = osl.NewSandbox(sb.Key(), false, false)
 		})