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

Merge pull request #46202 from thaJeztah/daemon_deferrrrr

Browse source 
daemon: Daemon.connectToNetwork, Daemon.ContainerRename: improve err-handling in defers
This commit is contained in:
Sebastiaan van Stijn 2024-01-08 12:40:45 +01:00 • committed by GitHub
commit adba0c2b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/container_operations.go
View file

@ -679,7 +679,7 @@ func buildEndpointDNSNames(ctr *container.Container, aliases []string) []string
return sliceutil.Dedup(dnsNames)
}
func (daemon *Daemon) connectToNetwork(cfg *config.Config, container *container.Container, idOrName string, endpointConfig *networktypes.EndpointSettings, updateSettings bool) (err error) {
func (daemon *Daemon) connectToNetwork(cfg *config.Config, container *container.Container, idOrName string, endpointConfig *networktypes.EndpointSettings, updateSettings bool) (retErr error) {
start := time.Now()
if container.HostConfig.NetworkMode.IsContainer() {
return runconfig.ErrConflictSharedNetwork
@ -737,8 +737,8 @@ func (daemon *Daemon) connectToNetwork(cfg *config.Config, container *container.
return err
}
defer func() {
if err != nil {
if e := ep.Delete(false); e != nil {
if retErr != nil {
if err := ep.Delete(false); err != nil {
log.G(context.TODO()).Warnf("Could not rollback container connection to network %s", idOrName)
}
}

50
daemon/rename.go
View file

@ -17,42 +17,35 @@ import (
// to find the container. An error is returned if newName is already
// reserved.
func (daemon *Daemon) ContainerRename(oldName, newName string) (retErr error) {
var (
sid string
sb *libnetwork.Sandbox
)
if oldName == "" || newName == "" {
return errdefs.InvalidParameter(errors.New("Neither old nor new names may be empty"))
}
if newName[0] != '/' {
newName = "/" + newName
}
container, err := daemon.GetContainer(oldName)
if err != nil {
return err
}
container.Lock()
defer container.Unlock()
oldName = container.Name
if oldName == newName {
// Canonicalize name for comparing.
if newName[0] != '/' {
newName = "/" + newName
}
if container.Name == newName {
return errdefs.InvalidParameter(errors.New("Renaming a container with the same name as its current name"))
}
links := map[string]*dockercontainer.Container{}
for k, v := range daemon.linkIndex.children(container) {
if !strings.HasPrefix(k, oldName) {
return errdefs.InvalidParameter(errors.Errorf("Linked container %s does not match parent %s", k, oldName))
if !strings.HasPrefix(k, container.Name) {
return errdefs.InvalidParameter(errors.Errorf("Linked container %s does not match parent %s", k, container.Name))
}
links[strings.TrimPrefix(k, oldName)] = v
links[strings.TrimPrefix(k, container.Name)] = v
}
if newName, err = daemon.reserveName(container.ID, newName); err != nil {
newName, err = daemon.reserveName(container.ID, newName)
if err != nil {
return errors.Wrap(err, "Error when allocating new name")
}
@ -61,6 +54,7 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) (retErr error) {
daemon.linkIndex.link(container, v, newName+k)
}
oldName = container.Name
container.Name = newName
defer func() {
@ -83,16 +77,14 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) (retErr error) {
daemon.linkIndex.unlink(oldName+k, v, container)
daemon.containersReplica.ReleaseName(oldName + k)
}
if err = container.CheckpointTo(daemon.containersReplica); err != nil {
if err := container.CheckpointTo(daemon.containersReplica); err != nil {
return err
}
attributes := map[string]string{
"oldName": oldName,
}
if !container.Running {
daemon.LogContainerEventWithAttributes(container, events.ActionRename, attributes)
daemon.LogContainerEventWithAttributes(container, events.ActionRename, map[string]string{
"oldName": oldName,
})
return nil
}
@ -108,14 +100,12 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) (retErr error) {
}
}()
sid = container.NetworkSettings.SandboxID
if sid != "" && daemon.netController != nil {
sb, err = daemon.netController.SandboxByID(sid)
if sid := container.NetworkSettings.SandboxID; sid != "" && daemon.netController != nil {
sb, err := daemon.netController.SandboxByID(sid)
if err != nil {
return err
}
if err := sb.Rename(newName[1:]); err != nil {
if err = sb.Rename(strings.TrimPrefix(container.Name, "/")); err != nil {
return err
}
defer func() {
@ -168,6 +158,8 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) (retErr error) {
}
}
daemon.LogContainerEventWithAttributes(container, events.ActionRename, attributes)
daemon.LogContainerEventWithAttributes(container, events.ActionRename, map[string]string{
"oldName": oldName,
})
return nil
}