No need for container.Lock if rename same name
During the renaming of a container, no need to call `container.Lock()` if `oldName == newName`. This is a follow-up from #23360 (commit88d1ee6c11
) Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit7e1ec8d2bd
)
This commit is contained in:
parent
77e3708bf7
commit
8084f80259
1 changed files with 3 additions and 3 deletions
|
@ -33,13 +33,13 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error {
|
|||
oldName = container.Name
|
||||
oldIsAnonymousEndpoint := container.NetworkSettings.IsAnonymousEndpoint
|
||||
|
||||
container.Lock()
|
||||
defer container.Unlock()
|
||||
|
||||
if oldName == newName {
|
||||
return fmt.Errorf("Renaming a container with the same name as its current name")
|
||||
}
|
||||
|
||||
container.Lock()
|
||||
defer container.Unlock()
|
||||
|
||||
if newName, err = daemon.reserveName(container.ID, newName); err != nil {
|
||||
return fmt.Errorf("Error when allocating new name: %v", err)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue