0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork: Controller.NewSandbox: use named error-return

Browse source 
It's used in various defers, but was using `err` as name, which can be
confusing, and increases the risk of accidentally shadowing the error.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-16 13:24:44 +02:00
parent cbe692ffd1
commit 56b62640a2
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libnetwork/controller.go
View file

@ -866,7 +866,7 @@ func (c *Controller) NetworkByID(id string) (*Network, error) {
}
// NewSandbox creates a new sandbox for containerID.
func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (*Sandbox, error) {
func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (_ *Sandbox, retErr error) {
if containerID == "" {
return nil, types.BadRequestErrorf("invalid container ID")
}
@ -930,9 +930,8 @@ func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (*
}
c.mu.Unlock()
var err error
defer func() {
if err != nil {
if retErr != nil {
c.mu.Lock()
if sb.ingress {
c.ingressSandbox = nil
@ -941,11 +940,12 @@ func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (*
}
}()
if err = sb.setupResolutionFiles(); err != nil {
if err := sb.setupResolutionFiles(); err != nil {
return nil, err
}
if sb.config.useDefaultSandBox {
var err error
c.sboxOnce.Do(func() {
c.defOsSbox, err = osl.NewSandbox(sb.Key(), false, false)
})
@ -959,6 +959,7 @@ func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (*
}
if sb.osSbox == nil && !sb.config.useExternalKey {
var err error
if sb.osSbox, err = osl.NewSandbox(sb.Key(), !sb.config.useDefaultSandBox, false); err != nil {
return nil, fmt.Errorf("failed to create new osl sandbox: %v", err)
}
@ -980,15 +981,14 @@ func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (*
c.sandboxes[sb.id] = sb
c.mu.Unlock()
defer func() {
if err != nil {
if retErr != nil {
c.mu.Lock()
delete(c.sandboxes, sb.id)
c.mu.Unlock()
}
}()
err = sb.storeUpdate()
if err != nil {
if err := sb.storeUpdate(); err != nil {
return nil, fmt.Errorf("failed to update the store state of sandbox: %v", err)
}