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

Provide error when engine version is unsupported. 

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
This commit is contained in:
Dong Chen 2016-01-25 15:58:48 -08:00
parent cc4eea83da
commit abffebf09e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/engine.go
View File

@ -369,7 +369,9 @@ func (e *Engine) updateSpecs() error {
// Older versions of Docker don't expose the ID field, Labels and are not supported // Older versions of Docker don't expose the ID field, Labels and are not supported
// by Swarm. Catch the error ASAP and refuse to connect. // by Swarm. Catch the error ASAP and refuse to connect.
if engineVersion.LessThan(minSupportedVersion) { if engineVersion.LessThan(minSupportedVersion) {
return fmt.Errorf("engine %s is running an unsupported version of Docker Engine. Please upgrade to at least %s", e.Addr, minSupportedVersion) err = fmt.Errorf("engine %s is running an unsupported version of Docker Engine. Please upgrade to at least %s", e.Addr, minSupportedVersion)
e.CheckConnectionErr(err)
return err
} }
e.Lock() e.Lock()

2
cluster/swarm/cluster.go
View File

@ -825,7 +825,7 @@ func (c *Cluster) Info() [][]string {
info := [][]string{ info := [][]string{
{"\bStrategy", c.scheduler.Strategy()}, {"\bStrategy", c.scheduler.Strategy()},
{"\bFilters", c.scheduler.Filters()}, {"\bFilters", c.scheduler.Filters()},
{"\bNodes", fmt.Sprintf("%d", len(c.engines))}, {"\bNodes", fmt.Sprintf("%d", len(c.engines)+len(c.pendingEngines))},
} }
engines := c.listEngines() engines := c.listEngines()