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

Merge pull request #45736 from thaJeztah/reserve_once

Browse source 
daemon: registerName(): don't reserve name twice
This commit is contained in:
Sebastiaan van Stijn 2023-06-20 23:47:40 +02:00 committed by GitHub
commit ab60412cb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/names.go
View file

@ -26,11 +26,12 @@ func (daemon *Daemon) registerName(container *container.Container) error {
return err return err
} }
if container.Name == "" { if container.Name == "" {
name, err := daemon.generateNewName(container.ID) name, err := daemon.generateAndReserveName(container.ID)
if err != nil { if err != nil {
return err return err
} }
container.Name = name container.Name = name
return nil
} }
return daemon.containersReplica.ReserveName(container.Name, container.ID) return daemon.containersReplica.ReserveName(container.Name, container.ID)
} }
@ -42,7 +43,7 @@ func (daemon *Daemon) generateIDAndName(name string) (string, string, error) {
) )
if name == "" { if name == "" {
if name, err = daemon.generateNewName(id); err != nil { if name, err = daemon.generateAndReserveName(id); err != nil {
return "", "", err return "", "", err
} }
return id, name, nil return id, name, nil
@ -81,7 +82,7 @@ func (daemon *Daemon) releaseName(name string) {
daemon.containersReplica.ReleaseName(name) daemon.containersReplica.ReleaseName(name)
} }
func (daemon *Daemon) generateNewName(id string) (string, error) { func (daemon *Daemon) generateAndReserveName(id string) (string, error) {
var name string var name string
for i := 0; i < 6; i++ { for i := 0; i < 6; i++ {
name = namesgenerator.GetRandomName(i) name = namesgenerator.GetRandomName(i)