1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

30671 commits

Author SHA1 Message Date
Krasi Georgiev
8ddfd2f759 more descriptive error fo checkpoint ls for non existent containers
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
2017-02-02 00:42:29 +02:00
Vincent Demeester
3c64061b67 Merge pull request from xlgao-zju/break-the-for
exit collect when we get EOF
2017-02-01 22:29:18 +01:00
Alexander Morozov
dc20f2abd4 Merge pull request from cpuguy83/logger_ring_buffer
Implement optional ring buffer for container logs
2017-02-01 13:04:01 -08:00
Alexander Morozov
3138a8f9f2 Merge pull request from dnephin/fix-stack-remove-test-flake
Add missing build tag for stack tests
2017-02-01 12:31:02 -08:00
Alexander Morozov
39f717ac89 Merge pull request from albers/completion-checkpoints
Add bash completion for `docker checkpoint`
2017-02-01 11:44:37 -08:00
Alexander Morozov
f9998c8c9f Merge pull request from mattmoor/track-elided-pulls
Add tracking to elided layer pulls.
2017-02-01 11:38:35 -08:00
Brian Goff
3f4fccb65f Use sync.Pool for logger Messages
This reduces allocs and bytes used per log entry significantly as well
as some improvement to time per log operation.

Each log driver, however, must put messages back in the pool once they
are finished with the message.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-02-01 13:52:37 -05:00
Brian Goff
054abff3b6 Implement optional ring buffer for container logs
This allows the user to set a logging mode to "blocking" (default), or
"non-blocking", which uses the ring buffer as a proxy to the real log
driver.

This allows a container to never be blocked on stdio at the cost of
dropping log messages.

Introduces 2 new log-opts that works for all drivers, `log-mode` and
`log-size`. `log-mode` takes a  value of "blocking", or "non-blocking"
I chose not to implement this as a bool since it is difficult to
determine if the mode was set to false vs just not set... especially
difficult when merging the default daemon config with the container config.
`log-size` takes a size string, e.g. `2MB`, which sets the max size
of the ring buffer. When the max size is reached, it will start
dropping log messages.

```
BenchmarkRingLoggerThroughputNoReceiver-8           	2000000000	        36.2 ns/op	 856.35 MB/s	       0 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputWithReceiverDelay0-8   	300000000	       156 ns/op	 198.48 MB/s	      32 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputConsumeDelay1-8        	2000000000	        36.1 ns/op	 857.80 MB/s	       0 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputConsumeDelay10-8       	1000000000	        36.2 ns/op	 856.53 MB/s	       0 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputConsumeDelay50-8       	2000000000	        34.7 ns/op	 894.65 MB/s	       0 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputConsumeDelay100-8      	2000000000	        35.1 ns/op	 883.91 MB/s	       0 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputConsumeDelay300-8      	1000000000	        35.9 ns/op	 863.90 MB/s	       0 B/op	       0 allocs/op
BenchmarkRingLoggerThroughputConsumeDelay500-8      	2000000000	        35.8 ns/op	 866.88 MB/s	       0 B/op	       0 allocs/op
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-02-01 13:52:37 -05:00
Alexander Morozov
dc78b3a1d4 Merge pull request from ncdc/journald-logdriver-drain-one-more-time-after-follow-ends
journald logs: drain 1 more time at container exit
2017-02-01 10:30:14 -08:00
Daniel Nephin
dd1d35c269 Add missing build tag for stack tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-01 13:25:37 -05:00
Vincent Demeester
829ea91bd1 Merge pull request from vdemeester/29809-fix-network-ipam-configuration-on-master
Follow-up of 29826 Use default driver for IPAM if none
2017-02-01 17:53:49 +01:00
Vincent Demeester
354bd4aadd Merge pull request from yongtang/29492-daemon-shm-size
Add daemon option `--default-shm-size`
2017-02-01 16:56:10 +01:00
Vincent Demeester
4c1b40b9d4 Merge pull request from yongtang/28624-docker-plugin-ls
Add `--filter enabled=true` for `docker plugin ls`
2017-02-01 16:52:00 +01:00
Brian Goff
f907205f5d Merge pull request from Thynix/30374-remove-kickass
Replace "kickass" in name generator with "vigorous"
2017-02-01 10:33:07 -05:00
Vincent Demeester
1b6a15eedc Merge pull request from yongtang/27178-ps-filter-publish-expose
Add `publish` and `expose` filter for `docker ps --filter`
2017-02-01 16:32:28 +01:00
Vincent Demeester
27f90acd61 Merge pull request from mlaventure/cgroup-devices
Allow adding rules to cgroup devices.allow on container create/run
2017-02-01 16:29:34 +01:00
Vincent Demeester
caa78da1c6 Merge pull request from jim-minter/attachrace
Resolve race conditions in attach API call
2017-02-01 16:20:50 +01:00
Vincent Demeester
e66717e9f8 Merge pull request from DiSiqueira/asserting_error
Underscoring an unused var in tests
2017-02-01 16:08:20 +01:00
Vincent Demeester
c322064127
Use default driver for IPAM if none
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-01 15:54:56 +01:00
Jim Minter
84d6240cfe Resolve race conditions in attach API call
Signed-off-by: Jim Minter <jminter@redhat.com>
2017-02-01 09:01:36 +00:00
Vincent Demeester
8f8c4f20e3 Merge pull request from Microsoft/jjh/vendorgowinio
Revendor Microsoft/go-winio v0.3.8
2017-02-01 09:52:55 +01:00
Vincent Demeester
1de72681b5 Merge pull request from johndmulhausen/patch-3
Fix for 404 in docs
2017-02-01 09:50:11 +01:00
Vincent Demeester
60f8f3fd64 Merge pull request from tiborvass/plugin_errors
plugin: use pkg/errors in more places
2017-02-01 09:44:19 +01:00
Vincent Demeester
deb0885419 Merge pull request from thaJeztah/carry-29590
some grammatical errors
2017-02-01 09:40:17 +01:00
Xinbo Weng
5b258f6ac2
some grammatical errors
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-31 19:33:12 -08:00
Sebastiaan van Stijn
36db5f6f68 Merge pull request from davidwilliamson/patch-1
Provide password to volume create command
2017-01-31 19:20:30 -08:00
John Mulhausen
3c3456885d Fix for https://github.com/docker/docker.github.io/issues/1413
Signed-off-by: John Mulhausen <john@docker.com>
2017-01-31 18:59:21 -08:00
Steve Dougherty
2b30a79d9e
Replace "kickass" in name generator with "vigorous"
Having curse words in container names can get awkward.

Closes .

Signed-off-by: Steve Dougherty <steve@asksteved.com>
2017-01-31 21:33:23 -05:00
Victor Vieux
6365d8dd19 Merge pull request from tophj-ibm/add-p-z-to-release-deb
[ppc64le/s390x] add p/z to release-deb
2017-01-31 17:39:17 -08:00
John Howard
da6739c99f Revendor Microsoft/go-winio v0.3.8
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-31 16:46:59 -08:00
Tibor Vass
26d0bac895 plugin: use pkg/errors in more places
Also provide stack trace output in daemon logs.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-01-31 16:45:26 -08:00
Matt Moore
d5482089bf Add tracking to elided layer pulls.
Signed-off-by: Matt Moore <mattmoor@google.com>
2017-01-31 16:36:17 -08:00
Victor Vieux
2b412120b6 Merge pull request from mlaventure/update-containerd
Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
2017-01-31 16:34:50 -08:00
Alexander Morozov
052f593530 Merge pull request from jroenf/patch-1
Fix syntax in label example
2017-01-31 14:55:13 -08:00
jroenf
ada374f316 Fix syntax in example
Signed-off-by: Jeroen Franse <jeroenfranse@gmail.com>
2017-01-31 23:51:06 +01:00
Kenfe-Mickael Laventure
50886f49b9 Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-31 14:36:51 -08:00
DiSiqueira
4bd1895241 I found out this err var isn't being used, so underscoring it to preserve resources
Signed-off-by: DiSiqueira <dieg0@live.com>
2017-01-31 19:48:15 -02:00
Alexander Morozov
ebaf1ced72 Merge pull request from rhvgoyal/docker-overlay-error
Warn if kernel does not support overlay with selinux
2017-01-31 13:41:02 -08:00
Phil Estes
feb8b1c581 Merge pull request from vdemeester/29732-follow-up-compose-indempotent
Make docker stack deploy a little bit more indempotent
2017-01-31 13:35:04 -08:00
Alexander Morozov
1d2f5de49a Merge pull request from yongtang/29972-service-read-only
Add `--read-only` for `service create` and `service update`
2017-01-31 13:20:00 -08:00
Vincent Demeester
818ef47394 Merge pull request from yongtang/28199-shorten
Add `truncate` function for Go templates
2017-01-31 21:56:21 +01:00
Alexander Morozov
048fc98c09 Merge pull request from thaJeztah/fix-build-from-local-github-directories
do not ignore local build-contexts starting with "github.com"
2017-01-31 12:45:11 -08:00
Alexander Morozov
0fbff69ab0 Merge pull request from tophj-ibm/fix-systemd-dropin-link
Update systemd drop-in link
2017-01-31 12:30:16 -08:00
Sebastiaan van Stijn
229625cd47 Merge pull request from anusha-ragunathan/doc_update
Add docs for service create based on plugins.
2017-01-31 12:05:04 -08:00
Christopher Jones
7c763b360a
Update systemd drop-in link
Right now it redirects, so change it to the correct one.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-01-31 12:31:00 -05:00
Vincent Demeester
9c94fa4563 Merge pull request from shin-/fix-network-prune-swagger-typo
Fix typo in swagger.yaml for NetworkPrune operation
2017-01-31 11:27:47 +01:00
Vincent Demeester
b61fe846b1 Merge pull request from albers/completion-swarm-logs
Add bash completion for `docker service logs`
2017-01-31 11:10:48 +01:00
Vincent Demeester
c0a1d2e0d8 Merge pull request from msabansal/natfix
Added support for dns-search and fixes 
2017-01-31 11:05:29 +01:00
Joffrey F
20c5fa3758 Fix typo in swagger.yaml for NetworkPrune operation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:25:39 -08:00
Sebastiaan van Stijn
a51c17f90b Merge pull request from vieux/more_rebuild_labels
add powerpc and z to rebuild labels
2017-01-30 18:11:04 -08:00