Commit Graph

20395 Commits

Author SHA1 Message Date
c9d7b160f7 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8c578b8190a9abd5a48efa723878a12568f91e54
Component: engine
2015-04-03 14:43:21 +08:00
d2894c5f4b Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
Add some missing option to bash completion
Upstream-commit: a3a45a6ec0278ac37eee7cebe57e728b2cd2165c
Component: engine
2015-04-02 22:49:58 -07:00
3b7f375359 Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
Signed-off-by: Joey Gibson <joey@joeygibson.com>
Upstream-commit: a9443de7c5759398804acaa3fd9ccfb196557cfe
Component: engine
2015-04-03 00:18:21 -04:00
8c6dabaae6 If docker search with --starts=${negative number}, it would show the warning.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
2015-04-03 08:55:34 +08:00
7156a27c06 Merge pull request #11995 from icecrime/test_daemon_stop
Properly stop test daemon in integration-cli
Upstream-commit: f92e88b7e0bb782badbd45d95a4013c7f1ddbb19
Component: engine
2015-04-02 20:27:20 -04:00
e0fc0cdcdd Merge pull request #12040 from duglin/TableFromDiff
Remove use of Table from 'docker diff'
Upstream-commit: 3f1590f6797a30dfd30010d6d2e1567ff6d53729
Component: engine
2015-04-02 17:21:40 -07:00
68cf0c513e Remove use of Table from 'docker diff'
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 49c72506ace177e33d867123ca15f193c38bcf45
Component: engine
2015-04-02 16:55:58 -07:00
efa6b62065 Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
Fixes docker events since beginning of unix time
Upstream-commit: 9c505c906d318df7b5e8652c37e4df06b4f30d56
Component: engine
2015-04-02 15:03:04 -07:00
c1f9e7351f integration-cli: add check for TestPsListContainersSize when no containers are returned
* when no containers are returned, go test would then aborts with:
  panic: runtime error: index out of range

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 3e51a8147510fb59d6206fe7310feaebc2d69fbc
Component: engine
2015-04-02 14:45:52 -07:00
54f3509eb1 Update libcontainaer to d00b8369852285d6a830a8d3b9
Fixes #12015

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d12fef1515cb3f0938ea6ed8cab8351e2df2753e
Component: engine
2015-04-02 14:12:55 -07:00
68a3810b3c devmapper: Retry device removal after 100ms instead of 10ms
Right now we try device removal at the interval of 10ms and keep on trying
till either device is removed or 10 seconds are over. That means if device
is busy, we will try 1000 times in those 10 seconds.

Sounds too high a frequency of deivce removal retrial. All the logs are
filled easily. I think it is a good idea to slow down a bit and retry at
the interval of 100ms instead of 10ms.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: c737800b7faced4b53854c8cb6766ebe58a3c3e9
Component: engine
2015-04-02 16:47:14 -04:00
a0411faab2 devmapper: Remove call to waitClose()
During device removal, we are first waiting for device to close() in a tight
loop for 10 seconds. I am not sure why do we need it. First of all we come
here once the umount() is successful so device should be free. For some reason
of device is temporarily busy, then removeDevice() logic retries device removal
logic in a loop for 10 seconds and that should cover it. Can't see why one
more 10 seoncds loop is required before attempting device removal.

One loop should be able to cover all the temporary device busy conditions and
if condition is not temporary then 10 seconds loop is not going to help anyway.

So instead of two loops of 10 seconds each, I am converting it to a single
loop of 20 seconds. May be 10 second loop is good enough but for now I am
keeping it 20 seconds to avoid any regressions.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: f74d12012c21349b2bd51d9c395a99331ff0a9a5
Component: engine
2015-04-02 16:47:14 -04:00
12beb9b276 devmapper: Remove extra wait after device removal
Currently in device removal path (device deactivation), we wait
for 10 seconds for devive to actually go away. waitRemove().

In current code this is not required. If dm removal task has completed
and one has done the wait on udev cookie, then device is gone and there
is no need to write another loop to wait for device removal.

This patch removes the waitRemove() which waits for 10 seconds after
device removal. This seems unnecessary.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: dbf04ec4e2a6b4fe73f7f300918a906c0ff1a37b
Component: engine
2015-04-02 16:47:14 -04:00
5b01c8abc0 devmapper: Use a pointer as argument to deferred function UdevWait()
UdevWait() is deferred and takes uint cookie as an argument. As arguments
to deferred functions are calculated at the time of call, it is possible
that any update to cookie later by libdm are not taken into account when
UdevWait() is called. Hence use a pointer to uint as argument to UdevWait()
function.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 665656afbb8932a11c69c0cd79e21a768aa46d38
Component: engine
2015-04-02 16:47:14 -04:00
cb8a2764e5 devicemapper: Remove debug messages from RemoveDevice()
devmapper graph driver retries device removal 1000 times in case of failure
and if this fills up console with 1000 messages (when daemon is running in
debug mode). So remove these debug messages.
 
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: cb7c893275c32ddfa775c3f22869a9c211024c71
Component: engine
2015-04-02 16:47:14 -04:00
2b212c76e7 devmapper: Fix libdm logging
There are issues with libdm logging. Right now if docker daemon is run
in debug mode, logging by libdm is too verbose. And if a device can't 
be removed, thousands of messages fill the console and one can not see
what's going on.

This patch removes devicemapper.LogInitVerbose() call as that call will
only work if docker was not registering its own log handler with libdm.
For some reason docker registers one with libdm and libdm hands over
all the messages to docker (including debug ones). And now it is up to
devmapper backend to figure out which ones should go to console and
which ones should not.

So by default log only fatal messages from libdm. One can easily modify
the code to change it for debugging purposes.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: e07d3cd9acf14219f33e12375fb8c2e3fe02ad0c
Component: engine
2015-04-02 16:47:14 -04:00
7a161db875 Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
TestVolumesFromHasPriority fix race
Upstream-commit: c88b2c422ff55099f8dae2a39566698c42b3d354
Component: engine
2015-04-02 16:01:09 -04:00
5a322b178c Merge pull request #12011 from jfrazelle/fix-lxc-device-test
fix device test on lxc...
Upstream-commit: 42c78550142321f4b5109118f3d2d2b8c529e83c
Component: engine
2015-04-02 16:00:39 -04:00
f437be36ca Merge pull request #12026 from cpuguy83/add_self_to_maintainers
Add cpuguy83 to maintainers.people
Upstream-commit: 104b20a133e03b66dfd663ee135b0ac1e3bc7c73
Component: engine
2015-04-02 09:20:19 -07:00
c2b08878f0 Properly stop test daemon in integration-cli
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 02c2308e39930677a7f4bb7f4215331a4d87566f
Component: engine
2015-04-02 08:53:31 -07:00
2ebb5f4928 daemon/logger/jsonfilelog: avoid some allocations
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 132da3f036287896cb3ba9f9f2573ad36bbb69cc
Component: engine
2015-04-02 18:33:23 +03:00
1031605b86 integration-cli: make TestPsGroupPortRange fast
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: cfa8aaf16f1f3b777851555afc83a1112c4f8879
Component: engine
2015-04-02 18:26:29 +03:00
64b84b5716 Fixes #11721 removed GenerateRandomString
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>

gofmt

Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 6896016b7c7a95ac33c77a222c359cf35a471eb9
Component: engine
2015-04-02 08:07:52 -07:00
aa32736c19 Added unit tests for stringutils GenerateRandomAlphaOnlyString and GenerateRandomAsciiString
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 11287f77144954fe82f75ade671da739559c664f
Component: engine
2015-04-02 07:12:47 -07:00
b507a74819 Add cpuguy83 to maintainers.people
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6ac845edadbf6374a9ee53f105c34265aed32d42
Component: engine
2015-04-02 08:51:47 -04:00
088a52cbda Merge pull request #11149 from duglin/8667-AdvancedVars
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
2015-04-02 08:25:49 -04:00
5eb5b13997 docs: keep the style of docker-commit consistent with docker-import
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 8fa03df8850c6eb3ecdce1266c72ed8d7af3a5bb
Component: engine
2015-04-02 05:01:14 -04:00
842af15e9f api/server: fix profiler HTTP serving
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 3bea892d5458fc627f2ebe26f44a09df018d1fcc
Component: engine
2015-04-02 09:53:40 +03:00
2fbe877abc Updating with man pages for distribution
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b6d55ebcbc93ce66aa9906aa87e1081f21ba1650
Component: engine
2015-04-01 21:02:19 -07:00
3c9c482afa TestVolumesFromHasPriority fix race
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: c447fd339a9293ea528ba0c8f4154cf1f953186c
Component: engine
2015-04-01 18:06:28 -07:00
51cc2549fc fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: f472c7236f7f7ea069b2997391569e5ec60981ab
Component: engine
2015-04-01 17:47:36 -07:00
c94431c226 Add MEMCG_SWAP_ENABLED to check-config.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a9588158b54bc8866bddfa0445c14831e02ebbbc
Component: engine
2015-04-02 08:38:39 +08:00
82a7741d14 Make server_windows.go consistent with server_linux.go
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 7433c9c92a9d2b53331f729249ddbbfa70cb76de
Component: engine
2015-04-01 17:31:15 -07:00
acae61c8ad Infer type
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 34f44c642faa94ae5d5677d49f690533c67cdf5e
Component: engine
2015-04-01 17:31:09 -07:00
9135f9f621 Merge pull request #10745 from jfrazelle/device-dir
Mounting a dir of devices like /dev/snd should mount all child devices
Upstream-commit: b9be50b578f86e858113b9c334e1748e15b63263
Component: engine
2015-04-01 16:53:01 -07:00
0b52fe32d3 docs: fix bullet list and missing label filter
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 37c7f3a2046dc01c6c58ed64638faf136dd0682c
Component: engine
2015-04-02 01:48:28 +02:00
d12a5b6e48 Merge pull request #12007 from crosbymichael/fix-oom-hang
Return closed channel if oom notification fails
Upstream-commit: 3f77f627d041ae388f4f591a2187be225629d6b7
Component: engine
2015-04-01 15:59:20 -07:00
c8180f954e Mounting a directory of devices like /dev/snd should mount all child devices.
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 664004ed0c6c99369720a00f5673f1e106d9496d
Component: engine
2015-04-01 15:57:41 -07:00
8f29ea870c Merge pull request #12005 from LK4D4/bump_docs
Bump API version and docs to v1.19
Upstream-commit: 3fe7a3d53766de88cddd0e1c324869183cd609cf
Component: engine
2015-04-01 15:34:28 -07:00
8391dba9e0 Merge pull request #11099 from iavael/bugfix/tar-symlinks
Fixed handling hardlinks to symlinks in tar stream
Upstream-commit: 88b8fc10e3dc5613859da31900e0a1b0bbb303c6
Component: engine
2015-04-01 18:34:00 -04:00
aeb6266db3 Return closed channel if oom notification fails
When working with Go channels you must not set it to nil or else the
channel will block forever.  It will not panic reading from a nil chan
but it blocks.  The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7061a993c5b620d6e68450f1b90f3458bfa1add0
Component: engine
2015-04-01 15:30:48 -07:00
8815a68d5e Merge pull request #12006 from icecrime/add_kitematic_to_readme
Add Kitematic to README.md
Upstream-commit: 2c0ee48224d4831db55b66073f4b4a1f1a0d86f5
Component: engine
2015-04-01 14:41:41 -07:00
444eef9af1 Add Kitematic to README.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7bd250c74d1dbc64be2ccb0978e1babd55d18afa
Component: engine
2015-04-01 14:38:49 -07:00
2f0180cd18 Add some new graphics for installation and understanding docs
Fixes: #11552

- scalable SVG
- uses colours from the rest of the page
- emphasizes that boot2docker is the ordinary Linux setup in a VM
- Add new graphic for architecture diagram
- Add windows boot2docker diagram
- Add windows diagram to documentation
- Remove old PNGs; replaced with SVGs
- Add redirects for new SVG versions of installation diagrams

Signed-off-by: Nick Irvine <nfirvine@nfirvine.com>
Upstream-commit: 1a4d2a5c8b4b130e93c652743bab4547b8bf9aba
Component: engine
2015-04-01 14:24:53 -07:00
cd5f423b1f Bump API version and docs to v1.19
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
80f31b5c3f Merge pull request #11974 from crosbymichael/registry-jobs
Remove jobs from registry.Service
Upstream-commit: 4467b6a2cbb2b075803e4a6cc10672871cb6c323
Component: engine
2015-04-01 16:32:41 -04:00
e4993ed96b Make explanation consistent with command
To reduce confusion of the reader.  Fixes a likely cut & paste error.

Signed-off-by: Simon Leinen <simon.leinen@gmail.com>
Upstream-commit: b58c4b8e689121ab4869472405a3db89094ac4de
Component: engine
2015-04-01 21:54:21 +02:00
f573d53da8 Merge pull request #11990 from duglin/11985-RemoveDeadCode
Remove dead code looking for non-existent err msg
Upstream-commit: 7101419c1c44083cf8ba30b4469d4cde4ab05e55
Component: engine
2015-04-01 10:46:10 -07:00
Jay
c3eb3fd267 Added information about accessing host directory on Windows.
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6e46204ab80b6df52c168fc06873280fc051d768
Component: engine
2015-04-01 13:36:43 -04:00
d25b9e78b6 Fixes docker events since beginning of unix time
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 8f7ac20bacfa6964ea830bfc6dfd4fc8c66bc9c3
Component: engine
2015-04-01 18:14:59 +01:00