Commit graph

37061 commits

Author SHA1 Message Date
Brian Goff
5d818213ff Fix Microsecond -> Milisecond.
A bit too quick on the trigger on some text completion I think...

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-07-12 18:43:08 -07:00
Sebastiaan van Stijn
0e041d68d8
Merge pull request #39506 from thaJeztah/group_test_subdirs
integration: organize bundle directory per test
2019-07-12 21:50:15 +02:00
Kirill Kolyshkin
5cd635b80d
Merge pull request #39510 from cpuguy83/test_daemon_ping_logs
Don't log test initial test daemon ping failures
2019-07-12 10:42:40 -07:00
Michael Crosby
a4a1e57e9d
Merge pull request #39496 from cpuguy83/fix_missing_dir_cleanup_file
Ensure parent dir exists for mount cleanup file
2019-07-12 13:39:58 -04:00
Michael Crosby
6913656d98
Merge pull request #39168 from thaJeztah/harden_TestClientWithRequestTimeout
Harden TestClientWithRequestTimeout
2019-07-12 13:36:36 -04:00
Michael Crosby
1d52c0b82d
Merge pull request #39500 from cpuguy83/custom_containerd_namespace
Add (hidden) flags to set containerd namespaces
2019-07-12 13:35:14 -04:00
Sebastiaan van Stijn
8fa0899ff5
Merge pull request #39508 from thaJeztah/fix_remove_bundles
Fix "Removing bundles/" not actually removing bundles
2019-07-12 19:17:25 +02:00
Brian Goff
15675e28f1 Don't log test initial test daemon ping failures
This is just noise due to timing. I picked `> 2` just based on
logs from tests I've seen there's always 1 or 2.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-07-12 09:51:32 -07:00
Sebastiaan van Stijn
f75f34249b
Fix "Removing bundles/" not actually removing bundles
Before:

Running `ls -la bundles/` before, and after removing:

    ls -la bundles/
    total 16
    drwxr-xr-x  7 root root  224 Jul 12 12:25 .
    drwxr-xr-x  1 root root 4096 Jul 12 12:30 ..
    drwxr-xr-x  2 root root   64 Jul 12 10:00 dynbinary
    drwxr-xr-x  6 root root  192 Jul 12 12:25 dynbinary-daemon
    lrwxrwxrwx  1 root root    1 Jul 12 12:25 latest -> .
    drwxr-xr-x 92 root root 2944 Jul 12 12:29 test-integration

    Removing bundles/

    ls -la bundles/
    total 16
    drwxr-xr-x  7 root root  224 Jul 12 12:25 .
    drwxr-xr-x  1 root root 4096 Jul 12 12:30 ..
    drwxr-xr-x  2 root root   64 Jul 12 10:00 dynbinary
    drwxr-xr-x  6 root root  192 Jul 12 12:25 dynbinary-daemon
    lrwxrwxrwx  1 root root    1 Jul 12 12:25 latest -> .
    drwxr-xr-x 92 root root 2944 Jul 12 12:29 test-integration

After:

Running `ls -la bundles/` before, and after removing:

    ls -la bundles/
    total 16
    drwxr-xr-x  7 root root  224 Jul 12 12:25 .
    drwxr-xr-x  1 root root 4096 Jul 12 12:30 ..
    drwxr-xr-x  2 root root   64 Jul 12 10:00 dynbinary
    drwxr-xr-x  6 root root  192 Jul 12 12:25 dynbinary-daemon
    lrwxrwxrwx  1 root root    1 Jul 12 12:25 latest -> .
    drwxr-xr-x 92 root root 2944 Jul 12 12:29 test-integration

    Removing bundles/

    ls -la bundles/
    total 4
    drwxr-xr-x 2 root root   64 Jul 12 12:25 .
    drwxr-xr-x 1 root root 4096 Jul 12 12:30 ..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-12 14:41:08 +02:00
Sebastiaan van Stijn
c7816c5323
Harden TestClientWithRequestTimeout
DeadlineExceeded now implements a TimeOut() function,
since dc4427f372

Check for this interface, to prevent possibly incorrect failures;

```
00:16:41 --- FAIL: TestClientWithRequestTimeout (0.00s)
00:16:41     client_test.go:259: assertion failed:
00:16:41         --- context.DeadlineExceeded
00:16:41         +++ err
00:16:41         :
00:16:41         	-: context.deadlineExceededError{}
00:16:41         	+: &net.OpError{Op: "dial", Net: "tcp", Addr: s"127.0.0.1:49294", Err: &poll.TimeoutError{}}
00:16:41
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-12 12:31:51 +02:00
Akihiro Suda
c7d1908d90
Merge pull request #39434 from crosbymichael/exec-failure-event
Send exec exit event on failures
2019-07-12 19:24:45 +09:00
Sebastiaan van Stijn
9b5e78888d
integration: organize bundle directory per test
The test-integration/test=integration-cli directory contains
a directory for each daemon that was created during the integration
tests, which makes it a long list to browse through. In addition,
some tests spin up multiple daemons, and when debugging test-failures,
the daemon-logs often have to be looked at together.

This patch organizes the bundl directory to group daemon storage
locationos per test, making it easier to find information about
all the daemons that were used in a specific test.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-12 12:13:02 +02:00
Brian Goff
24ad2f486d Add (hidden) flags to set containerd namespaces
This allows our tests, which all share a containerd instance, to be a
bit more isolated by setting the containerd namespaces to the generated
daemon ID's rather than the default namespaces.

This came about because I found in some cases we had test daemons
failing to start (really very slow to start) because it was (seemingly)
processing events from other tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-07-11 17:27:48 -07:00
Brian Goff
7725b88edc Ensure parent dir exists for mount cleanup file
While investigating a test failure, I found this in the logs:

```
time="2019-07-04T15:06:32.622506760Z" level=warning msg="Error while setting daemon root propagation, this is not generally critical but may cause some functionality to not work or fallback to less desirable behavior" dir=/go/src/github.com/docker/docker/bundles/test-integration/d1285b8250308/root error="error writing file to signal mount cleanup on shutdown: open /tmp/dxr/d1285b8250308/unmount-on-shutdown: no such file or directory"
```

This path is generated from the daemon's exec-root, which appears to not
exist yet. This change just makes sure it exists before we try to write
a file.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-07-11 13:30:36 -07:00
Yong Tang
2fc3480222
Merge pull request #39492 from fuweid/me-update-reload-comment
dockerd: update reload signal comment
2019-07-11 07:27:58 -07:00
Wei Fu
dbb5da7fcd dockerd: update reload signal comment
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-07-11 09:28:49 +08:00
Sebastiaan van Stijn
aa8249ae1b
Merge pull request #39470 from thaJeztah/remove_unused_requirements
integration-cli: remove unused requirements utils
2019-07-10 17:35:59 +02:00
Yong Tang
026fae5d7d
Merge pull request #39469 from thaJeztah/remove_default_sleep_image
integration-cli: remove defaultSleepImage constant
2019-07-10 07:29:08 -07:00
Yong Tang
1dbdf3c749
Merge pull request #39474 from tao12345666333/update-to-go-1.12.7
Bump Golang 1.12.7
2019-07-10 07:27:55 -07:00
Kirill Kolyshkin
f550cb5792
Merge pull request #39401 from tao12345666333/update-to-alpine-3.10
Update to using alpine 3.10
2019-07-09 14:34:37 -07:00
Yong Tang
d118a08292
Merge pull request #39471 from crosbymichael/parse-cgroups
Enhance container detection on some corner cases (carry #36038)
2019-07-09 10:30:21 -07:00
Akihiro Suda
57d7ff4c42
Merge pull request #39468 from thaJeztah/remove_exec_support
integration-cli: remove ExecSupport check
2019-07-10 01:03:27 +09:00
Jintao Zhang
aafdb63f21 Bump Golang 1.12.7
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2019-07-09 12:01:20 +08:00
Robert Wang
2f9e62611e Enhance container detection on some corner cases.
Not really bullet-proof, users can still create cgroups with name like
"foo:/init.scope" or "\nfoo" to bypass the detection. However, solving
these cases will require kernel to provide a better interface.

Signed-off-by: Robert Wang <robert@arctic.tw>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-08 15:31:41 -04:00
Michael Crosby
fb459f6671
Merge pull request #38441 from sirlatrom/swarm_plugin_env
Allow specifying environment variables when installing an engine plugin as a Swarm service
2019-07-08 15:26:55 -04:00
Sebastiaan van Stijn
6ee56d7b59
Merge pull request #39443 from cpuguy83/error_response_error
Make `ErrorResponse` implement `Error`
2019-07-08 21:02:28 +02:00
Sebastiaan van Stijn
c887b09abc
integration-cli: remove unused requirements utils
Removes some test functions that were unused:

- bridgeNfIP6tables
- ambientCapabilities (added to support #26979, which was reverted in #27737)
- overlay2Supported

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-08 18:58:46 +02:00
Sebastiaan van Stijn
27f432ca57
integration-cli: remove defaultSleepImage constant
Both Linux and Windows now use busybox, so no need to keep a
constant for this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-08 18:42:08 +02:00
Sebastiaan van Stijn
7204341950
integration-cli: remove ExecSupport check
All current versions of Docker support exec, so no need
to check for this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-08 18:31:34 +02:00
Yong Tang
4abac69dc6
Merge pull request #39389 from thaJeztah/fix_LCOW_healthchecks
LCOW: fix using wrong shell for healthchecks
2019-07-06 10:35:27 +08:00
Brian Goff
089757d5f8
Merge pull request #39383 from crosbymichael/exec-hang
Handle blocked I/O of exec'd processes
2019-07-05 10:51:43 -07:00
Sebastiaan van Stijn
8bf02823d8
Merge pull request #39462 from cpuguy83/chroot_unsupported
Add realChroot for non linux/windows
2019-07-04 15:55:55 +02:00
Brian Goff
34d5b8867f Add realChroot for non linux/windows
3029e765e2 broke compilation on
non-Linux/Windows systems.
This change fixes that.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-07-03 14:36:48 -07:00
Yong Tang
b2b2de3699
Merge pull request #39455 from seemethere/remove_cocky
Remove cocky from names-generator
2019-07-03 16:36:51 +08:00
Yong Tang
a89f2f3b36
Merge pull request #39390 from thaJeztah/add_version_to_api_changes
Add info OSVersion to API changelog.
2019-07-03 13:08:08 +08:00
Yong Tang
e20bccdf31
Merge pull request #39217 from microsoft/jjh/lcowfromscratch
LCOW: Fix FROM scratch
2019-07-03 10:09:46 +08:00
Sebastiaan van Stijn
b422095d93
Merge pull request #39453 from crosbymichael/swarm-flake
Skip TestServiceRemoveKeepsIngressNetwork
2019-07-03 03:40:16 +02:00
Sebastiaan van Stijn
2de5e3afad
Merge pull request #39452 from crosbymichael/test-restart
Improve select for daemon restart tests
2019-07-03 01:11:27 +02:00
Sebastiaan van Stijn
77657ea737
Merge pull request #39346 from dperny/fix-more-grpc-sizes
Fix more grpc list message sizes
2019-07-02 23:07:53 +02:00
Michael Crosby
527f9f75d6
Merge pull request #39423 from carlosedp/riscv64
Update modules to support riscv64
2019-07-02 17:07:35 -04:00
Michael Crosby
b94218560e Skip TestServiceRemoveKeepsIngressNetwork
Ref: #39426

This is a common flaky test that I have seen on multiple PRs.  It is not
consistent and should be skipped until it is fixed to be robust.  A
simple fix for the swarm tests is not easy as they all poll and have 1
billion timeouts in all the tests so a skip is valid here.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-02 16:33:25 -04:00
Michael Crosby
402433a5e4 Improve select for daemon restart tests
This improves the select logic for the restart tests or starting the
daemon in general.  With the way the ticker and select was setup, it was
possible for only the timeout to be displayed and not the wait errors.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-02 16:16:33 -04:00
Brian Goff
6ddd43b589 Make ErrorResponse implement Error
This allows an ErrorResponse to be used directly as an error type.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-07-02 10:17:03 -07:00
Michael Crosby
a43a2ed746
Merge pull request #39445 from lzhfromustc/master
ioutils: Fixed a potential data race in bytespipe
2019-07-02 13:02:47 -04:00
Eli Uriegas
8be39cd277 Remove cocky from names-generator
Could be misinterpreted as something not too kosher

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-07-02 16:51:11 +00:00
Sebastiaan van Stijn
6a7ebf044c
Merge pull request #39444 from tonistiigi/userns-empty
builder-next: reset identitymapping if empty
2019-07-02 11:02:42 +02:00
lzhfromutsc
c2479f6ebf Fixed the inconsistence and also a potential data race in pkg/ioutils/bytespipe.go: bp.closeErr is read/write 8 times; 7 out of 8 times it is protected by bp.mu.Lock(); 1 out of 8 times it is read without a Lock
Signed-off-by: lzhfromutsc <lzhfromustc@gmail.com>
2019-07-01 11:38:38 -07:00
Tonis Tiigi
0bdcc60c4c builder-next: reset identitymapping if empty
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-07-01 11:26:27 -07:00
CarlosEDP
9eaab0425b Update modules to support riscv64
Signed-off-by: CarlosEDP <me@carlosedp.com>
2019-06-29 18:45:42 +00:00
Tibor Vass
e105a74c54
Merge pull request #39216 from thaJeztah/bump_vndr
bump vndr to f5ab8fc5f, and revendor
2019-06-29 10:39:37 -07:00