From 1e5a2d596a54b8f09135dfeed22d051c5e00ab05 Mon Sep 17 00:00:00 2001 From: selansen Date: Mon, 26 Feb 2018 14:48:37 -0500 Subject: [PATCH 1/2] Adding new Forbidden Error type Adding new Error type so that moby code base can use it to provide better error handling experince to the caller. Signed-off-by: selansen --- error.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/error.go b/error.go index 5f00709ff9..7d6b6c925a 100644 --- a/error.go +++ b/error.go @@ -107,6 +107,16 @@ func (nnr NetworkNameError) Error() string { // Forbidden denotes the type of this error func (nnr NetworkNameError) Forbidden() {} +// PredefinedNetworkError is returned when user tries to create predefined network that already exists. +type PredefinedNetworkError string + +func (pnr PredefinedNetworkError) Error() string { + return fmt.Sprintf("operation is not permitted on predefined %s network ", string(pnr)) +} + +// Forbidden denotes the type of this error +func (pnr PredefinedNetworkError) Forbidden() {} + // UnknownNetworkError is returned when libnetwork could not find in its database // a network with the same name and id. type UnknownNetworkError struct { From 13d4f7b0ef9395ddc8f4809dd7a42b09c5510437 Mon Sep 17 00:00:00 2001 From: selansen Date: Thu, 3 May 2018 16:15:44 -0400 Subject: [PATCH 2/2] For testing Purpose Signed-off-by: selansen --- controller.go | 4 +++- network.go | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/controller.go b/controller.go index 225f7fa609..14dea4d515 100644 --- a/controller.go +++ b/controller.go @@ -49,6 +49,7 @@ import ( "net" "path/filepath" "runtime" + "runtime/debug" "strings" "sync" "time" @@ -1052,7 +1053,8 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (S if containerID == "" { return nil, types.BadRequestErrorf("invalid container ID") } - + logrus.Debugf("SAANVIIIIII %s", containerID) + debug.PrintStack() var sb *sandbox c.Lock() for _, s := range c.sandboxes { diff --git a/network.go b/network.go index e283d65815..ae9dd3be11 100644 --- a/network.go +++ b/network.go @@ -2056,6 +2056,7 @@ func (c *controller) getConfigNetwork(name string) (*network, error) { } func (n *network) createLoadBalancerSandbox() error { + var err error sandboxName := n.name + "-sbox" sbOptions := []SandboxOption{} if n.ingress { @@ -2090,10 +2091,12 @@ func (n *network) createLoadBalancerSandbox() error { } }() - if err := ep.Join(sb, nil); err != nil { + err = ep.Join(sb, nil) + if err != nil { return err } - return sb.EnableService() + err = sb.EnableService() + return err } func (n *network) deleteLoadBalancerSandbox() {