Skip to content

Update libnetwork with fixes for duplicate IP addresses#36589

Merged
tiborvass merged 1 commit intomoby:masterfrom
thaJeztah:fix-duplicate-ip-issues
Mar 14, 2018
Merged

Update libnetwork with fixes for duplicate IP addresses#36589
tiborvass merged 1 commit intomoby:masterfrom
thaJeztah:fix-duplicate-ip-issues

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 14, 2018

This updates libnetwork to moby/libnetwork@8892d75 to bring in IPAM fixes for duplicate IP addresses.

Full diff: https://github.com/docker/libnetwork/compare/3aca383eb555510f3f17696f9505f7bfbd25f0e5... 8892d7537c67232591f1f3af60587e3e77e61d41

Signed-off-by: Sebastiaan van Stijn [email protected]

- What I did

- How I did it

- How to verify it

- Description for the changelog

* Fix IPAM assigning duplicate IP addresses []()

Copy link
Member Author

@thaJeztah thaJeztah Mar 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updating userland-proxy accordingly, but it was not in sync with the vendor moby/libnetwork@ed2130d...2112cac (don't think this brings in any changes in the proxy)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

umph; this needs to be fixed in libnetwork: github.com/golang/sync is not the canonical import path. This is the same package as golang.org/x/sync

vndr github.com/golang/sync
2018/03/14 11:54:37 Collecting initial packages
2018/03/14 11:55:00 Download dependencies
2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened moby/libnetwork#2111 to fix that

@thaJeztah thaJeztah changed the title Update libnetwork with fixes for duplicate IP addresses [WIP] Update libnetwork with fixes for duplicate IP addresses Mar 14, 2018
@thaJeztah
Copy link
Member Author

made this WIP, pending moby/libnetwork#2111 to be merged, after which this needs to be updated.

@codecov
Copy link

codecov bot commented Mar 14, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@592a15b). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #36589   +/-   ##
=========================================
  Coverage          ?   34.73%           
=========================================
  Files             ?      612           
  Lines             ?    45410           
  Branches          ?        0           
=========================================
  Hits              ?    15772           
  Misses            ?    27580           
  Partials          ?     2058

@thaJeztah thaJeztah changed the title [WIP] Update libnetwork with fixes for duplicate IP addresses Update libnetwork with fixes for duplicate IP addresses Mar 14, 2018
@thaJeztah
Copy link
Member Author

Actually; it's only used in a test, which is not vendored in, so we should be ok here

@thaJeztah
Copy link
Member Author

ping @fcrisciani @ddebroy @vdemeester PTAL

Copy link
Contributor

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

This updates libnetwork to 8892d7537c67232591f1f3af60587e3e77e61d41 to bring in
IPAM fixes for duplicate IP addresses.

- IPAM tests (libnetwork PR 2104) (no changes in vendored files)
- Fix for Duplicate IP issues  (libnetwork PR 2105)

Also bump golang/x/sync to match libnetwork (no code-changes, other
than the README being updated)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the fix-duplicate-ip-issues branch from 6b7f348 to 55e0fe2 Compare March 14, 2018 15:31
@thaJeztah
Copy link
Member Author

CI failed on some flaky tests, so I bumped the sha to include moby/libnetwork#2111 and retrigger CI

@thaJeztah
Copy link
Member Author

Tests still flaky on the same problem;

16:02:22 --- FAIL: TestServiceWithPredefinedNetwork (31.84s)
16:02:22 	daemon.go:283: [d7b900e6d5c08] waiting for daemon to start
16:02:22 	daemon.go:315: [d7b900e6d5c08] daemon started
16:02:22 	service_test.go:55: timeout hit after 30s: task count at 1 waiting for 0
16:02:22 	daemon.go:273: [d7b900e6d5c08] exiting daemon
16:02:22 === RUN   TestServiceWithIngressNetwork
16:02:54 --- FAIL: TestServiceWithIngressNetwork (32.64s)
16:02:54 	daemon.go:283: [d28413a7a2a93] waiting for daemon to start
16:02:54 	daemon.go:315: [d28413a7a2a93] daemon started
16:02:54 	service_test.go:110: timeout hit after 30s: task count at 1 waiting for 0
16:02:54 	daemon.go:273: [d28413a7a2a93] exiting daemon

Copy link
Member

@yongtang yongtang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member Author

something odd on the s390x. Should not be related to this PR though https://jenkins.dockerproject.org/job/Docker-PRs-s390x/8927/console;

/cc @tophj-ibm

17:50:44 ----------------------------------------------------------------------
17:50:44 FAIL: docker_cli_run_unix_test.go:1405: DockerSuite.TestRunPIDsLimit
17:50:44 
17:50:44 docker_cli_run_unix_test.go:1409:
17:50:44     out, _ := dockerCmd(c, "run", "--name", "skittles", "--pids-limit", "4", "busybox", "cat", file)
17:50:44 /go/src/github.com/docker/docker/vendor/github.com/gotestyourself/gotestyourself/icmd/command.go:65:
17:50:44     t.Fatalf(err.Error() + "\n")
17:50:44 ... Error: 
17:50:44 Command:  /usr/local/cli/docker run --name skittles --pids-limit 4 busybox cat /sys/fs/cgroup/pids/pids.max
17:50:44 ExitCode: 125
17:50:44 Error:    exit status 125
17:50:44 Stdout:   
17:50:44 Stderr:   runtime/cgo: pthread_create failed: Resource temporarily unavailable
17:50:44 SIGABRT: abort
17:50:44 PC=0x1306ca2 m=2 sigcode=4294967290
17:50:44 
17:50:44 goroutine 0 [idle]:
17:50:44 
17:50:44 goroutine 1 [runnable, locked to thread]:
17:50:44 github.com/opencontainers/runc/vendor/github.com/seccomp/libseccomp-golang._Cfunc_seccomp_load(0x14ad68e0, 0x14ad68e0)
17:50:44 	github.com/opencontainers/runc/vendor/github.com/seccomp/libseccomp-golang/_obj/_cgo_gotypes.go:427 +0x46
17:50:44 github.com/opencontainers/runc/vendor/github.com/seccomp/libseccomp-golang.(*ScmpFilter).Load.func1(0x14ad68e0, 0x14017d0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/vendor/github.com/seccomp/libseccomp-golang/seccomp.go:682 +0x54
17:50:44 github.com/opencontainers/runc/vendor/github.com/seccomp/libseccomp-golang.(*ScmpFilter).Load(0xc4200faba0, 0x0, 0x0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/vendor/github.com/seccomp/libseccomp-golang/seccomp.go:682 +0x9a
17:50:44 github.com/opencontainers/runc/libcontainer/seccomp.InitSeccomp(0xc42004ee40, 0xc42000e0e0, 0x0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go:77 +0x41a
17:50:44 github.com/opencontainers/runc/libcontainer.(*linuxStandardInit).Init(0xc4200fc9f0, 0x8, 0xc42000e0e0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/libcontainer/standard_init_linux.go:136 +0x986
17:50:44 github.com/opencontainers/runc/libcontainer.(*LinuxFactory).StartInitialization(0xc420096120, 0x0, 0x0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/libcontainer/factory_linux.go:321 +0x35e
17:50:44 main.glob..func6(0xc420088640, 0x0, 0x0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/init.go:24 +0x5e
17:50:44 reflect.Value.call(0x13841a0, 0x14011a8, 0x13, 0x13ebf56, 0x4, 0xc420043800, 0x1, 0x1, 0xc420043788, 0x13e16e0, ...)
17:50:44 	/usr/local/go/src/reflect/value.go:434 +0x87c
17:50:44 reflect.Value.Call(0x13841a0, 0x14011a8, 0x13, 0xc420043800, 0x1, 0x1, 0x15f3280, 0x127fc96, 0x13ec06a)
17:50:44 	/usr/local/go/src/reflect/value.go:302 +0x90
17:50:44 github.com/opencontainers/runc/vendor/github.com/urfave/cli.HandleAction(0x13841a0, 0x14011a8, 0xc420088640, 0x0, 0x0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/vendor/github.com/urfave/cli/app.go:487 +0x136
17:50:44 github.com/opencontainers/runc/vendor/github.com/urfave/cli.Command.Run(0x13ec08a, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x13fddd4, 0x51, 0x0, ...)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/vendor/github.com/urfave/cli/command.go:191 +0x8d8
17:50:44 github.com/opencontainers/runc/vendor/github.com/urfave/cli.(*App).Run(0xc420001980, 0xc42000c060, 0x2, 0x2, 0x0, 0x0)
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/vendor/github.com/urfave/cli/app.go:240 +0x4c0
17:50:44 main.main()
17:50:44 	/tmp/tmp.g8yqeMNbId/src/github.com/opencontainers/runc/main.go:147 +0x812
17:50:44 
17:50:44 goroutine 6 [syscall]:
17:50:44 os/signal.signal_recv(0x0)
17:50:44 	/usr/local/go/src/runtime/sigqueue.go:131 +0xf6
17:50:44 os/signal.loop()
17:50:44 	/usr/local/go/src/os/signal/signal_unix.go:22 +0x1e
17:50:44 created by os/signal.init.0
17:50:44 	/usr/local/go/src/os/signal/signal_unix.go:28 +0x3c
17:50:44 
17:50:44 r0   0x0	r1   0x0
17:50:44 r2   0x0	r3   0x3ffa901e618
17:50:44 r4   0x0	r5   0x8
17:50:44 r6   0xfffffffffffffff8	r7   0xc41fffff10
17:50:44 r8   0xf1	r9   0x3ffa00008c0
17:50:44 r10  0x3ffa901f910	r11  0x1627e38
17:50:44 r12  0x1627e28	r13  0x14472c0
17:50:44 r14  0x12caf3e	r15  0x3ffa901e578
17:50:44 pc   0x1306ca2	link 0x12caf3e
17:50:44 /usr/local/cli/docker: Error response from daemon: cannot start a stopped process: unknown.
17:50:44 time="2018-03-14T17:50:44Z" level=error msg="error waiting for container: context canceled" 
17:50:44 
17:50:44 
17:50:44 Failures:
17:50:44 ExitCode was 125 expected 0
17:50:44 Expected no error
17:50:44 
17:50:44 
17:50:49 

Copy link
Contributor

@abhi abhi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tiborvass
Copy link
Contributor

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants