Commit Graph

3688 Commits

Author SHA1 Message Date
John Howard
3c6f4cd5a6 Merge pull request #25143 from cpuguy83/update_go-check
Add stack dumps from the daemon(s) on test timeout
2016-08-15 22:09:20 -07:00
Tõnis Tiigi
90be7a591d Merge pull request #25482 from yuexiao-wang/close_pipe
Close pipe after using pipe
2016-08-15 13:02:59 -07:00
Tonis Tiigi
34f779dbc3 Clear raft state file after every test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-12 17:30:37 -07:00
Tõnis Tiigi
b08a1c3fe4 Merge pull request #25660 from justincormack/no-fuse-dev
Do not create /dev/fuse by default
2016-08-12 10:05:16 -07:00
Michael Crosby
be045ee2da Merge pull request #25628 from cpuguy83/carry_21567_filter_vol_by_label
Carry 21567 filter vol by label
2016-08-12 09:43:45 -07:00
Justin Cormack
39ecc08f32 Do not create /dev/fuse by default
This device is not required by the OCI spec.

The rationale for this was linked to docker/docker#2393

So a non functional /dev/fuse was created, and actual fuse use still is
required to add the device explicitly. However even old versions of the JVM
on Ubuntu 12.04 no longer require the fuse package, and this is all not
needed.

See also https://github.com/opencontainers/runc/pull/983 although this
change alone stops the fuse device being created.

Tested and does not change actual ability to use fuse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-12 12:33:42 +01:00
Anusha Ragunathan
4d009084de Fix deadlock on plugin shutdown.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-08-11 19:36:32 -07:00
Kai Qiang Wu(Kennan)
1a72934cd5 Add label filter support for volume
Since we added labels for volume, it is desired to have
filter support label for volume

Closes: #21416
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-08-11 13:08:04 -04:00
Yong Tang
b487497cd2 Idempotent service update --publish-add
This fix tries to address the issue raised in 25375 where
`service update --publish-add` returns an error if the exact
same value is repeated (idempotent).

This fix use a map to filter out repeated port configs so
that `--publish-add` does not error out.

An integration test has been added.

This fix fixes 25375.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-10 18:03:43 -07:00
Brian Goff
e34244842c Ignore socket rm errors on daemon suite teardown
Errors here are not important and not really related to set success/failure.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-10 15:18:35 -04:00
Alexander Morozov
64605d709f Merge pull request #23951 from allencloud/defer-os-file-close
add defer file.Close to avoid potential fd leak
2016-08-10 11:07:15 -07:00
Brian Goff
82dd2c3159 Make test suites dump daemon stack on test timeout
Use `OnTimeout` callback on test timeouts to trigger a stack dump for
running daemons. This will help analyze stuck tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-10 10:26:30 -04:00
allencloud
0ead624473 add defer file.Close to avoid potential fd leak
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-10 08:36:09 +08:00
Alexander Morozov
eb28dde01f Merge pull request #25518 from yuexiao-wang/add-debug-info
add more info for debugging
2016-08-09 11:56:09 -07:00
Sebastiaan van Stijn
8233e2b54d Merge pull request #25461 from coolljt0725/fix_update_mem
Fix update memory without memoryswap
2016-08-09 16:02:55 +02:00
yuexiao-wang
5882a9ea17 add more info for debugging
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-09 17:06:44 +08:00
Zhang Wei
da6609ccdc Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-09 09:42:23 +08:00
Zhang Wei
6dd8e10d6e Wait container's removal via Events API
If AutoRemove is set, wait until client get `destroy` events, or get
`detach` events that implies container is detached but not stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-08 22:46:53 +08:00
Zhang Wei
3c2886d8a4 Move --rm to daemon side
`--rm` is a client side flag which caused lots of problems:
1. if client lost connection to daemon, including client crash or be
killed, there's no way to clean garbage container.
2. if docker stop a `--rm` container, this container won't be
autoremoved.
3. if docker daemon restart, container is also left over.
4. bug: `docker run --rm busybox fakecmd` will exit without cleanup.

In a word, client side `--rm` flag isn't sufficient for garbage
collection. Move the `--rm` flag to daemon will be more reasonable.

What this commit do is:
1. implement a `--rm` on daemon side, adding one flag `AutoRemove` into
HostConfig.
2. Allow `run --rm -d`, no conflicting `--rm` and `-d` any more,
auto-remove can work on detach mode.
3. `docker restart` a `--rm` container will succeed, the container won't
be autoremoved.

This commit will help a lot for daemon to do garbage collection for
temporary containers.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-08 22:46:53 +08:00
Sebastiaan van Stijn
2684459ed4 Merge pull request #23718 from yongtang/23498-entrypoint-unset
Allow unset `--entrypoint` in `docker run` or `docker create`
2016-08-08 14:38:01 +02:00
Lei Jitang
92394785fa Fix update memory without memoryswap
The memory should always be smaller than memoryswap,
we should error out with message that user know how
to do rather than just an invalid argument error if
user update the memory limit bigger than already set
memory swap.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-08-08 18:36:03 +08:00
yuexiao-wang
256310e962 close pipe after using pipe
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-08 15:16:01 +08:00
yuexiao-wang
427869fe94 modify func namt from TestUserAgentPassThroughOnPull to TestUserAgentPassThrough
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-08 11:40:20 +08:00
Yong Tang
c8d3ee8093 Allow unset --entrypoint in docker run or docker create
This fix tries to address the issue raised in #23498 to allow unset
`--entrypoint` in `docker run` or `docker create`.

This fix checks the flag `--entrypoint` and, in case `--entrypoint=` (`""`)
is passed, unset the Entrypoint during the container run.

Additional integration tests have been created to cover changes in this fix.

This fix fixes #23498.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-05 16:35:20 -07:00
Tõnis Tiigi
4c528ae719 Merge pull request #25402 from lixiaobing10051267/masterChmod
Fatal info not identical with actual chmod intent
2016-08-05 08:42:30 -07:00
Vincent Demeester
1ccd9d3137 Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls
Add format flag to network and volume ls
2016-08-05 15:17:45 +02:00
Vincent Demeester
29fef34139 Merge pull request #25387 from yongtang/25374-ps-filter-order
Sort output of `docker ps --filter` with order by creation time
2016-08-05 14:47:10 +02:00
Vincent Demeester
85428a1a53 Merge pull request #25096 from vieux/docker_plugin_remove_force
Add --force to docker plugin remove
2016-08-05 14:45:05 +02:00
Vincent Demeester
f570fbb9ba Merge pull request #25401 from lixiaobing10051267/masterConfig
Docker api inspect assert HostConfig
2016-08-05 14:11:29 +02:00
Yong Tang
3f97133546 Sort output of docker ps --filter with order by creation time
This fix tries to address the issue raised in 25374 where the
output of `docker ps --filter` is in random order and
not deterministic.

This fix sorts the list of containers by creation time so that the
output is deterministic.

An integration test has been added.

This fix fixes 25374.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-04 19:27:50 -07:00
Victor Vieux
0016b331da Add --force to docker plugin remove
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-04 15:55:45 -07:00
Alexander Morozov
979d48bbf5 Merge pull request #23902 from dnephin/inspect-to-cobra
Convert inspect command to Cobra
2016-08-04 11:20:43 -07:00
Brian Goff
af51c9704c Merge pull request #25370 from thaJeztah/move-experimental-test
Move TestInspectNamedMountPoint integrationtest from experimental
2016-08-04 11:12:46 -04:00
lixiaobing10051267
86c72aa01f Docker api inspect Assert HostConfig
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-04 23:01:16 +08:00
Vincent Demeester
a488ad1a09 Add volume --format flag to ls
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-04 14:59:55 +02:00
Vincent Demeester
a8aaafc4a3 Add network --format flag to ls
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-04 14:59:51 +02:00
lixiaobing10051267
bd0ec7ed55 Fatal info not identical with actual chmod intent
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-04 20:14:15 +08:00
Michael Crosby
94b1bb82e1 Decrease sleep to 2 seconds
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-03 15:25:27 -07:00
Michael Crosby
cfde8e7855 Change number of pings to 1
This cuts the test time down from 6s to 2s

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-03 13:30:34 -07:00
Michael Crosby
2f3b7f08a0 Make network stats version test concurrent
This change makes the test run go down from 10s to 2s

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-03 13:24:55 -07:00
Michael Crosby
3ffa5f6149 Remove build 60 steps
This test is already covered in the individual graph driver tests and it
adds 15s to the test run without adding value.  The original idea was to
test max number of layers, this is fulfilled by the graph drivers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-03 13:16:01 -07:00
Daniel Nephin
fab2a3dc82 Ignore 'not a swarm error' when inspecting a task.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-03 12:22:07 -04:00
Sebastiaan van Stijn
6f2e820502 Move TestInspectNamedMountPoint integrationtest from experimental
This feature is no longer experimental, and should
now work on Windows too

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 16:21:38 +02:00
Vincent Demeester
4a94a6513b Merge pull request #25341 from tonistiigi/fix-pending-tests
Fix swarm pending state tests
2016-08-03 16:12:43 +02:00
Sebastiaan van Stijn
10ae908bfa Merge pull request #25159 from diogomonica/adding-force-to-node-remove
Adding force to node rm
2016-08-02 22:49:15 +02:00
Tonis Tiigi
fa3b5964b9 Fix swarm pending state tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-02 11:39:05 -07:00
Alexander Morozov
c73b054ae3 Merge pull request #25300 from duglin/FixEnv
Don't allow empty env names
2016-08-02 09:45:28 -07:00
Qiang Huang
da5d66fb70 Fix TestUpdateKernelMemoryUninitialized on new kernel version
Fixes: #25073

Update kernel memory on running containers without initialized
is forbidden only on kernel version older than 4.6.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-02 13:17:20 +08:00
Diogo Monica
a327c231b5 Add --force to node removal
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-08-01 18:55:58 -07:00
Aaron Lehmann
f35c4343f3 Merge pull request #24878 from dongluochen/swarmConstraintTest
Add integration test for constraints
2016-08-01 17:45:23 -06:00