From abffebf09e721b6e8a47aa5cb21d455855cf7419 Mon Sep 17 00:00:00 2001 From: Dong Chen Date: Mon, 25 Jan 2016 15:58:48 -0800 Subject: [PATCH] Provide error when engine version is unsupported. Signed-off-by: Dong Chen --- cluster/engine.go | 4 +++- cluster/swarm/cluster.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster/engine.go b/cluster/engine.go index f173e41df5..c489ed57d6 100644 --- a/cluster/engine.go +++ b/cluster/engine.go @@ -369,7 +369,9 @@ func (e *Engine) updateSpecs() error { // 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. 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() diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go index 2d42aab498..f8fad61260 100644 --- a/cluster/swarm/cluster.go +++ b/cluster/swarm/cluster.go @@ -825,7 +825,7 @@ func (c *Cluster) Info() [][]string { info := [][]string{ {"\bStrategy", c.scheduler.Strategy()}, {"\bFilters", c.scheduler.Filters()}, - {"\bNodes", fmt.Sprintf("%d", len(c.engines))}, + {"\bNodes", fmt.Sprintf("%d", len(c.engines)+len(c.pendingEngines))}, } engines := c.listEngines()