improve error of `docker network create -d overlay` on non-Swarm node #31912

AkihiroSuda · 2017-03-17T07:53:48Z

- What I did

Improved the error of docker network create -d overlay on non-Swarm node.

before: Error response from daemon: datastore for scope "global" is not initialized
after: Error response from daemon: This node is not a swarm manager. Use "docker swarm init" or "docker swarm join" to connect this node to swarm and try again.

This PR also vendors moby/libnetwork@f6ce0ce (for moby/libnetwork#1707)

- How I did it

Check daemon.clusterProvider during createNetwork().
Also, addedpkg/errorutils for deduplicating error literals.

- How to verify it

docker network create -d overlay on non-Swarm node

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

thaJeztah · 2017-03-17T11:03:52Z

daemon/network.go

@@ -262,6 +263,11 @@ func (daemon *Daemon) createNetwork(create types.NetworkCreateRequest, id string
 		driver = c.Config().Daemon.DefaultDriver
 	}

+	if driver == "overlay" &&
+		(daemon.clusterProvider == nil || !daemon.clusterProvider.IsManager()) {
+		return nil, errorutils.ErrNotSwarmManager


Will this be a problem if someone uses an external k/v store for overlay networks?

AkihiroSuda · 2017-03-23T02:57:54Z

@thaJeztah
Thank you for pointing out, updated PR to support external cluster store

cc @aboch @mavenugo

AkihiroSuda · 2017-03-23T02:58:42Z

daemon/network.go

@@ -262,6 +263,12 @@ func (daemon *Daemon) createNetwork(create types.NetworkCreateRequest, id string
 		driver = c.Config().Daemon.DefaultDriver
 	}

+	isSwarmModeManager := daemon.clusterProvider != nil && daemon.clusterProvider.IsManager()
+	withClusterStore := daemon.configStore.ClusterStore != "" // classic


I'm not sure looking up configStore is correct here, but netController does not seem to contain cluster store info

AkihiroSuda · 2017-04-05T02:17:07Z

Failure on windows and z should be unrelated.

PTAL

aboch · 2017-04-05T02:36:10Z

daemon/network.go

@@ -302,6 +303,12 @@ func (daemon *Daemon) createNetwork(create types.NetworkCreateRequest, id string
 		driver = c.Config().Daemon.DefaultDriver
 	}

+	isSwarmModeManager := daemon.clusterProvider != nil && daemon.clusterProvider.IsManager()
+	withClusterStore := daemon.configStore.ClusterStore != "" // classic
+	if driver == "overlay" && !isSwarmModeManager && !withClusterStore {


Thanks @AkihiroSuda, I agree with this change as it will remove the very confusing previous message.
But I think we should not base it on the driver name (overlay), because we support network plugins which can be global scope, therefore working with previous cluster store config and with new swarm.

What do you think about have libnetwork return a well known error in case the datastore is not present
https://github.com/docker/libnetwork/blob/master/store.go#L228
so that you can recognize it at L331 here and return the new error instead ?
You can define the error in https://github.com/docker/libnetwork/blob/master/error.go

AkihiroSuda · 2017-04-05T05:39:28Z

@aboch
Sure, opened moby/libnetwork#1707

AkihiroSuda · 2017-04-05T06:27:48Z

vendored moby/libnetwork#1707 in this PR

AkihiroSuda · 2017-04-10T09:00:40Z

rebased

PTAL @aboch

cc @vdemeester (pkg/errorutils seems weird place to add new error constants?)

thaJeztah

LGTM

ping @aboch @mavenugo PTAL

vdemeester · 2017-04-10T12:46:20Z

cc @vdemeester (pkg/errorutils seems weird place to add new error constants?)

@AkihiroSuda definitely, it shouldn't be in that package. /cc @dnephin

AkihiroSuda · 2017-04-10T13:43:03Z

@vdemeester Where is the best place?

aboch · 2017-04-10T15:22:06Z

Looks good to me

dnephin

LGTM

daemon/errors.go might have worked, but it's used from the CLI. I don't have any better suggetions

vdemeester · 2017-04-10T17:36:47Z

@dnephin @AkihiroSuda "daemon/errors.go might have worked, but it's used from the CLI. I don't have any better suggetions" yeah me neither but… having a swarm related error in a pkg package feels not right. We could put it somewhere in opts or another package that is referenced by both cli and daemon side 👼

AkihiroSuda · 2017-04-11T02:20:52Z

Until 1.12 we had github.com/docker/docker/errors pkg https://github.com/docker/docker/tree/1.12.x/errors

Can we revive this pkg? (with different content)

thaJeztah · 2017-04-11T09:27:59Z

If this is all because we want to prevent writing the error message twice; perhaps it's not that bad to just write it twice.

Also; the error message from the CLI could diverge from the error message generated by the daemon (in a way, it's already odd that the daemon/API returns instructions on how to use the CLI, while it doesn't even know what CLI is used)

thaJeztah · 2017-04-11T09:29:25Z

(i.e. the "Use "docker swarm init" or "docker swarm join" to connect this node to swarm and try again." part is something that the client should add probably)

before: Error response from daemon: datastore for scope "global" is not initialized after: Error response from daemon: This node is not a swarm manager. Use "docker swarm init" or "docker swarm join" to connect this node to swarm and try again. Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>

AkihiroSuda · 2017-04-12T05:32:19Z

Thank you @thaJeztah , removed errorutils pkg. PTAL.

vdemeester

LGTM 🦁

GordonTheTurtle added the status/0-triage label Mar 17, 2017

albers mentioned this pull request Mar 17, 2017

docker node ps does not check for swarm node #31879

Closed

thaJeztah reviewed Mar 17, 2017

View reviewed changes

thaJeztah added status/1-design-review and removed status/0-triage labels Mar 17, 2017

AkihiroSuda force-pushed the ovl-on-non-swarm branch from 7125f7e to 54da659 Compare March 23, 2017 02:57

AkihiroSuda commented Mar 23, 2017

View reviewed changes

AkihiroSuda force-pushed the ovl-on-non-swarm branch from 54da659 to 3a867d3 Compare March 23, 2017 03:18

AkihiroSuda added the rebuild/windowsRS1 label Mar 24, 2017

GordonTheTurtle removed the rebuild/windowsRS1 label Mar 24, 2017

AkihiroSuda added the rebuild/experimental label Mar 24, 2017

GordonTheTurtle removed the rebuild/experimental label Mar 24, 2017

AkihiroSuda added the rebuild/experimental label Mar 29, 2017

GordonTheTurtle removed the rebuild/experimental label Mar 29, 2017

GordonTheTurtle assigned crosbymichael Apr 1, 2017

AkihiroSuda force-pushed the ovl-on-non-swarm branch from 3a867d3 to 89086bc Compare April 4, 2017 07:45

AkihiroSuda added rebuild/experimental labels Apr 4, 2017

GordonTheTurtle removed rebuild/experimental labels Apr 4, 2017

aboch reviewed Apr 5, 2017

View reviewed changes

AkihiroSuda force-pushed the ovl-on-non-swarm branch from 89086bc to 5a3f4eb Compare April 5, 2017 05:37

AkihiroSuda mentioned this pull request Apr 5, 2017

improve error for getStore() moby/libnetwork#1707

Merged

AkihiroSuda removed the status/needs-vendoring label Apr 5, 2017

AkihiroSuda changed the title ~~improve error of docker network create -d overlay on non-Swarm node~~ improve error of docker network create -d overlay on non-Swarm node + vendor libnetwork@f6ce0ce Apr 5, 2017

AkihiroSuda force-pushed the ovl-on-non-swarm branch from f2ca26a to 444f3c9 Compare April 10, 2017 08:59

vdemeester requested review from vdemeester, dnephin and cpuguy83 April 10, 2017 09:04

AkihiroSuda changed the title ~~improve error of docker network create -d overlay on non-Swarm node + vendor libnetwork@f6ce0ce~~ improve error of docker network create -d overlay on non-Swarm node Apr 10, 2017

thaJeztah approved these changes Apr 10, 2017

View reviewed changes

thaJeztah added status/2-code-review and removed status/1-design-review labels Apr 10, 2017

dnephin approved these changes Apr 10, 2017

View reviewed changes

vieux added the rebuild/z label Apr 10, 2017

GordonTheTurtle removed the rebuild/z label Apr 10, 2017

AkihiroSuda force-pushed the ovl-on-non-swarm branch from 444f3c9 to 9c77a4c Compare April 12, 2017 05:31

AkihiroSuda added the rebuild/windowsRS1 label Apr 13, 2017

GordonTheTurtle removed the rebuild/windowsRS1 label Apr 13, 2017

vdemeester approved these changes Apr 24, 2017

View reviewed changes

vdemeester merged commit f9311c5 into moby:master Apr 24, 2017

thaJeztah added this to the 17.06 milestone Apr 24, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

improve error of `docker network create -d overlay` on non-Swarm node #31912

improve error of `docker network create -d overlay` on non-Swarm node #31912

AkihiroSuda commented Mar 17, 2017 •

edited

thaJeztah Mar 17, 2017

AkihiroSuda commented Mar 23, 2017

AkihiroSuda Mar 23, 2017

AkihiroSuda commented Apr 5, 2017

aboch Apr 5, 2017

AkihiroSuda commented Apr 5, 2017

AkihiroSuda commented Apr 5, 2017

AkihiroSuda commented Apr 10, 2017

thaJeztah left a comment

vdemeester commented Apr 10, 2017

AkihiroSuda commented Apr 10, 2017

aboch commented Apr 10, 2017

dnephin left a comment •

edited

vdemeester commented Apr 10, 2017

AkihiroSuda commented Apr 11, 2017

thaJeztah commented Apr 11, 2017

thaJeztah commented Apr 11, 2017

AkihiroSuda commented Apr 12, 2017

vdemeester left a comment

improve error of docker network create -d overlay on non-Swarm node #31912

improve error of docker network create -d overlay on non-Swarm node #31912

Conversation

AkihiroSuda commented Mar 17, 2017 • edited

thaJeztah Mar 17, 2017

Choose a reason for hiding this comment

AkihiroSuda commented Mar 23, 2017

AkihiroSuda Mar 23, 2017

Choose a reason for hiding this comment

AkihiroSuda commented Apr 5, 2017

aboch Apr 5, 2017

Choose a reason for hiding this comment

AkihiroSuda commented Apr 5, 2017

AkihiroSuda commented Apr 5, 2017

AkihiroSuda commented Apr 10, 2017

thaJeztah left a comment

Choose a reason for hiding this comment

vdemeester commented Apr 10, 2017

AkihiroSuda commented Apr 10, 2017

aboch commented Apr 10, 2017

dnephin left a comment • edited

Choose a reason for hiding this comment

vdemeester commented Apr 10, 2017

AkihiroSuda commented Apr 11, 2017

thaJeztah commented Apr 11, 2017

thaJeztah commented Apr 11, 2017

AkihiroSuda commented Apr 12, 2017

vdemeester left a comment

Choose a reason for hiding this comment

improve error of `docker network create -d overlay` on non-Swarm node #31912

improve error of `docker network create -d overlay` on non-Swarm node #31912

AkihiroSuda commented Mar 17, 2017 •

edited

dnephin left a comment •

edited