check unique container name

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
This commit is contained in:
Ezra Silvera 2016-05-11 12:15:04 +03:00
parent 5a6da69f6c
commit eac4981da8
1 changed files with 28 additions and 0 deletions

View File

@ -196,6 +196,10 @@ func (c *Cluster) CreateContainer(config *cluster.ContainerConfig, name string,
return nil, errResourcesNeeded
}
if !c.checkNameUniqueness(name) {
return nil, fmt.Errorf("Conflict: The name %s is already assigned. You have to delete (or rename) that container to be able to assign %s to a container again.", name, name)
}
task, err := task.NewTask(config, name, c.taskCreationTimeout)
if err != nil {
return nil, err
@ -678,3 +682,27 @@ func (c *Cluster) BuildImage(buildContext io.Reader, buildImage *types.ImageBuil
func (c *Cluster) TagImage(IDOrName string, ref string, force bool) error {
return errNotSupported
}
func (c *Cluster) checkNameUniqueness(name string) bool {
// Abort immediately if the name is empty.
if len(name) == 0 {
return true
}
c.RLock()
defer c.RUnlock()
for _, s := range c.agents {
for _, container := range s.engine.Containers() {
for _, cname := range container.Names {
log.Debugf("*************** cont:%v name:%v", container.Info.ID, cname)
if cname == name || cname == "/"+name {
return false
}
}
}
}
return true
}