Support dockerd and system restarts for ipvlan and macvlan networks #2415

arkodg · 2019-07-10T04:50:58Z

This commit carries forward the work done in
#2295
and fixes two things

Allows macvlan and ipvlan to be restored properly
after dockerd or the system is restarted
Makes sure the refcount for the configOnly network
is not incremented for the above case so this network
can be deleted after all the associated ConfigFrom networks
are deleted

Signed-off-by: Arko Dasgupta arko.dasgupta@docker.com

arkodg · 2019-07-10T04:51:28Z

selansen · 2019-07-12T18:54:09Z

drivers/ipvlan/ipvlan_network.go

+					return false, err
+				}
+				// if driver created the networks slave link, record it for future deletion
+				config.CreatedSlaveLink = true


I am hoping CreateSlaveLink will be already set to true vlanLinkExists returns True.
If not, can you pls move this line out of if condition.

ip mac vlan code I see there is else condition with debug log "vlan already exists" . should we add similar log here for consistent purpose ?

added the missing logs, also config.CreatedSlaveLink is already set to true, that is why we don't set it for the restart case

selansen · 2019-07-12T21:19:03Z

drivers/macvlan/macvlan_network.go

+				}
+				config.CreatedSlaveLink = true
+			} else {
+				logrus.Debugf("Dummy Link %s for Mac Vlan already exists", getDummyName(stringid.TruncateID(config.ID)))


should we have . config.CreatedSlaveLink = true in this else loop too? ( same as ipvlan code )? just to make sure "config.CreatedSlaveLink is set to True.

drivers/ipvlan/ipvlan_network.go

drivers/macvlan/macvlan_setup.go

selansen · 2019-07-12T21:29:07Z

We need second eye to review this PR.

cc : @mavenugo

thaJeztah · 2019-07-12T22:02:27Z

this addresses #1743 ?

arkodg · 2019-07-12T22:05:29Z

@thaJeztah yes, thanks, I'll edit the commit with this link

This commit carries forward the work done in moby#2295 and fixes two things 1. Allows macvlan and ipvlan to be restored properly after dockerd or the system is restarted 2. Makes sure the refcount for the configOnly network is not incremented for the above case so this network can be deleted after all the associated ConfigFrom networks are deleted Addresses: moby#1743 Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>

selansen

LGTM

selansen · 2019-07-16T01:50:06Z

@trapier Can you pls see if you can review it ?

arkodg · 2019-07-24T15:26:21Z

PTAL @chiragtayal

drivers/ipvlan/ipvlan_network.go

drivers/macvlan/macvlan_network.go

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>

selansen · 2019-07-25T22:04:47Z

@chiragtayal , pls LGTM and approve it if you are ok.
We can merge this PR.

chiragtayal

LGTM

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>

selansen · 2019-07-26T02:44:55Z

@trapier as you already started reviewing, Pls let me know

full diff: moby/libnetwork@83d30db...09cdcc8 changes included: - moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling - moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong - moby/libnetwork#2414 Allow network with --config-from to be --internal - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal - moby/libnetwork#2351 Use fewer modprobes - relates to moby#38930 Use fewer modprobes - moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle - fixes moby/libnetwork#1743 Phantom docker network Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

full diff: moby/libnetwork@83d30db...09cdcc8 changes included: - moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling - moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong - moby/libnetwork#2414 Allow network with --config-from to be --internal - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal - moby/libnetwork#2351 Use fewer modprobes - relates to moby/moby#38930 Use fewer modprobes - moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle - fixes moby/libnetwork#1743 Phantom docker network Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 6f234db9fef23c591d8376f96db062e7107b658f Component: engine

thaJeztah · 2019-08-22T09:16:11Z

relates to FIELD-211
relates to ENGCORE-960
relates to ENGCORE-692

full diff: moby/libnetwork@83d30db...09cdcc8 changes included: - moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling - moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong - moby/libnetwork#2414 Allow network with --config-from to be --internal - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal - moby/libnetwork#2351 Use fewer modprobes - relates to moby#38930 Use fewer modprobes - moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle - fixes moby/libnetwork#1743 Phantom docker network Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6f234db) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

full diff: moby/libnetwork@83d30db...09cdcc8 changes included: - moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling - moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong - moby/libnetwork#2414 Allow network with --config-from to be --internal - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal - moby/libnetwork#2351 Use fewer modprobes - relates to moby/moby#38930 Use fewer modprobes - moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle - fixes moby/libnetwork#1743 Phantom docker network Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6f234db9fef23c591d8376f96db062e7107b658f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: b6190c2713623ab455d29da4771b684e4eafc63f Component: engine

full diff: moby/libnetwork@83d30db...09cdcc8 changes included: - moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling - moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong - moby/libnetwork#2414 Allow network with --config-from to be --internal - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal - moby/libnetwork#2351 Use fewer modprobes - relates to moby#38930 Use fewer modprobes - moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle - fixes moby/libnetwork#1743 Phantom docker network Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: zach <Zachary.Joyner@linux.com>

arkodg mentioned this pull request Jul 10, 2019

phantom ip/mac vlan network after a powercycle #2295

Open

arkodg force-pushed the ipvlan-docker-restart-issue branch from 9a63597 to 5479614 Compare July 10, 2019 05:15

selansen reviewed Jul 12, 2019

View reviewed changes

selansen mentioned this pull request Jul 12, 2019

Add integration test for https://github.com/docker/libnetwork/pull/2415 moby/moby#39511

Open

arkodg force-pushed the ipvlan-docker-restart-issue branch from 5479614 to 4c5094c Compare July 15, 2019 22:38

selansen approved these changes Jul 16, 2019

View reviewed changes

chiragtayal reviewed Jul 24, 2019

View reviewed changes

drivers/ipvlan/ipvlan_network.go Outdated Show resolved Hide resolved

chiragtayal reviewed Jul 24, 2019

View reviewed changes

drivers/macvlan/macvlan_network.go Outdated Show resolved Hide resolved

Move dummyLinkExists into createDummyLink

ea744fb

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>

chiragtayal approved these changes Jul 25, 2019

View reviewed changes

Remove vlanLinkExists and dummyLinkExists since these are redundant

6d382cd

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>

arkodg force-pushed the ipvlan-docker-restart-issue branch from c39a277 to 6d382cd Compare July 25, 2019 23:37

selansen merged commit 09cdcc8 into moby:master Jul 26, 2019

arkodg deleted the ipvlan-docker-restart-issue branch July 29, 2019 22:39

thaJeztah mentioned this pull request Jul 30, 2019

bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1 moby/moby#39633

Merged

thaJeztah mentioned this pull request Aug 22, 2019

[19.03 backport] bump libnetwork to 92d1fbe1eb0883cf11d283cea8e658275146411d docker-archive/engine#330

Merged

thaJeztah mentioned this pull request Aug 16, 2023

libnetwork: Controller.NewNetwork, Controller.NewSandbox: use named error-return moby/moby#46240

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support dockerd and system restarts for ipvlan and macvlan networks #2415

Support dockerd and system restarts for ipvlan and macvlan networks #2415

arkodg commented Jul 10, 2019

arkodg commented Jul 10, 2019

selansen Jul 12, 2019

selansen Jul 12, 2019

arkodg Jul 15, 2019

selansen Jul 12, 2019

selansen commented Jul 12, 2019

thaJeztah commented Jul 12, 2019

arkodg commented Jul 12, 2019

selansen left a comment

selansen commented Jul 16, 2019

arkodg commented Jul 24, 2019

selansen commented Jul 25, 2019

chiragtayal left a comment •

edited

Loading

selansen commented Jul 26, 2019 •

edited

Loading

thaJeztah commented Aug 22, 2019 •

edited by jira bot

Loading

Support dockerd and system restarts for ipvlan and macvlan networks #2415

Support dockerd and system restarts for ipvlan and macvlan networks #2415

Conversation

arkodg commented Jul 10, 2019

arkodg commented Jul 10, 2019

selansen Jul 12, 2019

Choose a reason for hiding this comment

selansen Jul 12, 2019

Choose a reason for hiding this comment

arkodg Jul 15, 2019

Choose a reason for hiding this comment

selansen Jul 12, 2019

Choose a reason for hiding this comment

selansen commented Jul 12, 2019

thaJeztah commented Jul 12, 2019

arkodg commented Jul 12, 2019

selansen left a comment

Choose a reason for hiding this comment

selansen commented Jul 16, 2019

arkodg commented Jul 24, 2019

selansen commented Jul 25, 2019

chiragtayal left a comment • edited Loading

Choose a reason for hiding this comment

selansen commented Jul 26, 2019 • edited Loading

thaJeztah commented Aug 22, 2019 • edited by jira bot Loading

chiragtayal left a comment •

edited

Loading

selansen commented Jul 26, 2019 •

edited

Loading

thaJeztah commented Aug 22, 2019 •

edited by jira bot

Loading