Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18.09 backport] keep old network ids #149

Merged
merged 1 commit into from Feb 21, 2019

Conversation

@thaJeztah
Copy link
Member

thaJeztah commented Feb 11, 2019

backport of moby#38580 for 18.09

for windows all networks are re-populated in the store during network controller initialization. In current version it also regenerate network Ids which may be referenced by other components and it may cause broken references to a networks. This commit avoids regeneration of network ids.

for windows all networks are re-populated in the store during network controller initialization. In current version it also regenerate network Ids which may be referenced by other components and it may cause broken references to a networks. This commit avoids regeneration of network ids.

Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
(cherry picked from commit e017717)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.09.3 milestone Feb 11, 2019
@thaJeztah

This comment has been minimized.

Copy link
Member Author

thaJeztah commented Feb 18, 2019

Failure on PowerPC is unrelated, and should be fixed by #150 (I don't think a rebase is needed, as this PR only affects Windows)

21:31:40 breakoutError: "../victim/dotdot" is outside of "/tmp/docker-TestUntarInvalidFilenames681263291/dest"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink637502400/victim/hello" -> "../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink601277983/victim/hello" -> "/../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink113006834/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink161073065/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink327472372/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink988004803/victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink846077510/dest/dotdot" -> "../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink908380397/dest/slash-dotdot" -> "/../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink341034856/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink194043815/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink412541146/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink398698097/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink171138332/dest/dir/loophole" -> "../../victim"
21:31:40 --- FAIL: TestTarUntarWithXattr (0.00s)
21:31:40 	archive_unix_test.go:236: assertion failed: error is not nil: invalid argument
21:31:40 breakoutError: "../victim/dotdot" is outside of "/tmp/docker-TestApplyLayerInvalidFilenames616906941/dest"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink502152695/victim/hello" -> "../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink517108458/victim/hello" -> "/../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink128068417/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink192443308/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink668817179/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink650222014/victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink362502661/dest/dotdot" -> "../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink303792032/dest/slash-dotdot" -> "/../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink010907775/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink451325906/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink321944841/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink554881748/dest/loophole-victim" -> "../victim"
@thaJeztah

This comment has been minimized.

Copy link
Member Author

thaJeztah commented Feb 18, 2019

Copy link

fcrisciani left a comment

LGTM

@andrewhsu andrewhsu merged commit 9dc0488 into docker:18.09 Feb 21, 2019
4 of 5 checks passed
4 of 5 checks passed
powerpc Jenkins build Docker-PRs-powerpc 13307 has failed
Details
experimental Jenkins build Docker-PRs-experimental 44074 has succeeded
Details
janky Jenkins build Docker-PRs 52907 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 24052 has succeeded
Details
z Jenkins build Docker-PRs-s390x 13196 has succeeded
Details
@thaJeztah thaJeztah deleted the thaJeztah:18.09_backport_fix_restart branch Feb 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.