Commit Graph

996 Commits

Author SHA1 Message Date
David Scott
0affdd986d 9pudc: add defer conn.Close() for the connection to docker
Before this patch we were using `conn.CloseRead()` and `conn.CloseWrite()`
to flush and signal EOF properly in the proxy, but we forgot to actually
close the file descriptor. As a result we leaked one fd per request,
until the GC came along and closed them for us. This could explain why
the process appeared to block: new connections could not be accepted
because we were out of fds, but once the GC had happened (or we closed
some 9P fds as a result of the client on the host closing its connection)
then the process would unwedge.

This doesn't explain why the 9P filesystem itself would occasionally become
unresponsive in Linux, although apparently still processing requests normally
if you connect to it directly over the host-side socket.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-02-12 10:40:01 +00:00
Justin Cormack
b2871c2528 upgrade docker to 1.10.1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-11 13:58:50 -08:00
Justin Cormack
0afaff2c4a Add some wrappers to support at least the default uid mapping
The busybox adduser and addgroup commands are ignored by docker,
as it avoids symlinks, but they are not compatible so this is
kind of a good idea.

See https://github.com/docker/docker/blob/master/pkg/idtools/usergroupadd_linux.go

However, these do not yet deal with creating mapping ranges in /etc/subuid and
/etc/subgid, so initially we provide a set that match the default docker name
so at least docker daemon --userns-remap=default should work.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-10 15:47:37 -08:00
Justin Cormack
4564a44b8d remove temporary containers
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-10 14:31:37 -08:00
David Sheets
d545614ea1 Improve docker socket I/O by 30-70% each way
Upload into a container was 10MiB/s now 17MiB/s.
Download from a container was 16MiB/s now 21MiB/s.
2016-02-09 18:12:17 +00:00
David Sheets
c680e40bbe In conjunction with mirage/ocaml-9p#58, speeds up seq read 13x + seq write 11x 2016-02-09 17:40:56 +00:00
Justin Cormack
48fba08878 fix 9pudc startup
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-08 18:30:30 -08:00
Justin Cormack
f0fa9db182 logging for 9pudc
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-08 15:22:10 -08:00
Rolf Neugebauer
59f25b9c71 dnsfix: don't run it in a Hyper-V VM
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
c6c01019c4 hvtools: Force down the interface is config changes
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
205fd57f0c docker: also listen to local unix socket when running on Hyper-V
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
ab5c34aea1 hvtools: fix script to configure the IP address from the host
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
c2ff3b5dd2 mdnstool: don't start when running as a Hyper-V VM
Windows doesn't grok mDNS by default. No need to start mdnstool

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 15:49:02 -08:00
Justin Cormack
f7496850ce update to docker 1.10.0
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-04 12:03:05 -08:00
David Sheets
e98073c81e Fix the docker.log output filename 2016-02-04 11:04:18 +00:00
Justin Cormack
747265770c update to rc4
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-03 17:38:17 -08:00
Justin Cormack
0859dd3d69 upgrade to 1.10.0-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-02 21:29:51 -08:00
Justin Cormack
d459b0cb34 fix hupper killing docker on start
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-01 21:32:28 +00:00
Justin Cormack
75835d9917 fix gitignore
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-01 20:11:20 +00:00
Justin Cormack
5f1b1cb14f fix EOF in hupper
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-01 18:05:06 +00:00
Justin Cormack
f1a26faba3 missing brace
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-30 08:29:32 +01:00
Justin Cormack
4d31dd28d3 upgrade to docker 1.10.0-rc2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-28 23:26:29 +00:00
Justin Cormack
2514627c3f Merge pull request #18 from MagnusS/fixes
Improve DHCP speed
2016-01-28 22:32:06 +00:00
Rolf Neugebauer
031869f371 docker: start docker daemon with network on Hyper-V for now
On Windows, for now we use DOCKER_HOST and access the docker daemon
on Moby via the network.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-01-28 13:52:24 -08:00
Rolf Neugebauer
f37d7fe1af hvtools: Add .gitignore to ignore hvtools binaries
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-01-28 13:51:55 -08:00
Magnus Skjegstad
45b789dc39 mdnstool: fix if parameter, was ignored previously but default was ok
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2016-01-28 21:24:37 +01:00
Magnus Skjegstad
32c86c9822 udhcpc: set retransmission timeout to 1 sec (was 3 sec), retry if no offer after 3 sec (was 20 sec)
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2016-01-28 21:24:37 +01:00
Rolf Neugebauer
69f5cb301c alpine: Add Hyper-V daemons to the build
The daemons allow proper shutdown of a VM, heartbeats,
inquiring and setting the network configuratio etc etc.

They are only started with running in a Hyper-V VM

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-01-28 09:17:44 -08:00
Rolf Neugebauer
7cdecdd2e2 kernel: enable CONNECTOR and netlink MMAP access
Used by the Hyper-V daemons

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-01-28 09:14:11 -08:00
Justin Cormack
f47531f2a9 add a script to move all logs to host
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 13:36:36 +00:00
Justin Cormack
01227dc6f6 run docker after 9p fuse
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 13:20:45 +00:00
Justin Cormack
a327c706fe typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 12:19:02 +00:00
Justin Cormack
b7987a8ced read initial state from watchfile, should fix #17
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 12:16:02 +00:00
Justin Cormack
c15bff5cfe add generic database setup, and add sysctl support
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 11:42:52 +00:00
Justin Cormack
e41843a69c check if automount worked
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 11:14:05 +00:00
Justin Cormack
8a0899b069 eend in binfmt_misc for tidier boot log
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-27 10:53:38 +00:00
Justin Cormack
67fb87a8f6 typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-26 17:42:45 +00:00
Justin Cormack
de3ee7832c do not set graph driver in moby, use default or get from daemon.json config
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-26 12:35:46 +00:00
Justin Cormack
5ab15b564b for now always restart docker daemon, not send HUP as most changes require it
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-26 11:49:04 +00:00
Justin Cormack
bae12144e6 hupper does not strictly need to run after docker, just advisory
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-26 11:24:46 +00:00
Justin Cormack
e143f32816 add pidfile support to hupper
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-26 11:24:10 +00:00
Justin Cormack
34150463e5 add diagnostics for fuse if used
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-26 10:59:09 +00:00
Justin Cormack
bc3f3f005a make diagnostics run after all teh things it checks
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-25 23:25:25 +00:00
Justin Cormack
8f08cebf3b fix hupper
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-25 22:40:06 +00:00
Justin Cormack
af71eb1098 reorder test
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-25 22:28:02 +00:00
Justin Cormack
48239cdbdd Read exactly 43 bytes from watch
More and it hangs forever at present
Less and it will not read whole record

See https://github.com/docker/pinata/issues/766

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-25 21:10:13 +00:00
David Sheets
cb5e0d6865 9pudfuse: remove per-packet logging and catch write errors
Signed-off-by: David Sheets <sheets@alum.mit.edu>
2016-01-25 17:03:10 +00:00
David Sheets
c54d179146 9pudfuse: increase msize to 32k and move mkdir into 9pinit
Signed-off-by: David Sheets <sheets@alum.mit.edu>
2016-01-25 17:01:08 +00:00
Justin Cormack
3d95131a77 add boot2docker image compatibility
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-25 14:33:46 +00:00
Justin Cormack
569758a789 inline some config files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-25 11:47:35 +00:00