docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2080 from allencloud/log-warn-when-getting-engine-label-named-node 

send warn message if got an engine with label "node"
This commit is contained in:
Victor Vieux 2016-04-06 17:20:09 -07:00
parent e7077ff5e3 65a5d54727
commit ee30452059
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/engine.go
View File

@ -494,6 +494,16 @@ func (e *Engine) updateSpecs() error {
message := fmt.Sprintf("Engine (ID: %s, Addr: %s) contains an invalid label (%s) not formatted as \"key=value\".", e.ID, e.Addr, label)
return fmt.Errorf(message)
}
// If an engine managed by Swarm contains a label with key "node",
// such as node=node1
// `docker run -e constraint:node==node1 -d nginx` will not work,
// since "node" in constraint will match node.Name instead of label.
// Log warn message in this case.
if kv[0] == "node" {
log.Warnf("Engine (ID: %s, Addr: %s) containers a label (%s) with key of \"node\" which cannot be used in Swarm.", e.ID, e.Addr, label)
}
e.Labels[kv[0]] = kv[1]
}
return nil