Commit Graph

132 Commits

Author SHA1 Message Date
62c8ac5cdc Merge pull request #26579 from Microsoft/jjh/ociprocess
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
2016-09-19 22:52:16 +02:00
abf6940f56 Merge pull request #26640 from Microsoft/jjh/removeosversion
Windows: Remove osversion from OCI
Upstream-commit: b7e189ed1fd474d7cbdacc3b6b76e97fc2abf017
Component: engine
2016-09-19 15:42:34 -04:00
92d37247b3 Windows: OCI process struct convergence
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
2016-09-19 10:34:31 -07:00
13bd68497d Merge pull request #26505 from Microsoft/jjh/ocistep1
Windows OCI convergence step 1
Upstream-commit: 3fd3d28f5f82fc44d5e563c8f90dd00f037b9653
Component: engine
2016-09-19 10:23:11 -07:00
8abf4dbc45 Windows: Remove osversion from OCI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 72de562943a9bfbc44d24c80dfc9d0dc112ab0f4
Component: engine
2016-09-19 10:16:15 -07:00
aa8b9ee0c3 Merge pull request #26577 from Microsoft/jjh/fstabmount
Windows: Move to fstab options as per OCI
Upstream-commit: b72c7f74a616a52a52843cf5b295962845be3ba3
Component: engine
2016-09-19 10:13:46 -07:00
5a03e9169d Fix a race in libcontainerd/pausemonitor_linux.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 69f00a137c886bd0e06b9fd2bb438f4eab1ade50
Component: engine
2016-09-19 07:42:21 +00:00
9a39a676da Merge pull request #26650 from Microsoft/jjh/firststart
Windows: OCI remove first start
Upstream-commit: bc60f5af847d7ae7b466ecca7fc58a9345ee1084
Component: engine
2016-09-18 09:27:10 -04:00
efff8ce2a3 Merge pull request #26578 from Microsoft/jjh/ociuser
Windows: Unify OCI user struct
Upstream-commit: 112ba3637da812d4bbfd2095cd71c345eabc1500
Component: engine
2016-09-18 09:20:45 -04:00
f9fecb6904 Windows: OCI remove first start
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f7fd408ba78bd1e3a28751578084eaf4e69d6c5a
Component: engine
2016-09-16 16:05:55 -07:00
7342ae40e2 Windows: stats support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
dfe7e29f76 Windows: Move to fstab options as per OCI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bb585b9c106e8e81a445b2b864d673bc9f5991cd
Component: engine
2016-09-15 10:12:20 -07:00
5a9205e2eb Windows: Unify OCI user struct
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 93f61b85ebe184506a3d99cee3b4ebaac559c712
Component: engine
2016-09-15 09:59:27 -07:00
ee76200cde Windows OCI convergence step 1
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7c7c3d7746d0dd77a7c0454a5bfe56b406ebadf1
Component: engine
2016-09-12 16:11:47 -07:00
99577ad8e2 libcontainerd: use healthcheck to track containerd conn
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
7bef93723c Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
2016-09-08 21:31:52 -04:00
cc5c9f50ef Merge pull request #25777 from swernli/servicing_race
Fixing race in Windows container servicing
Upstream-commit: 4219c0018f129bf50d1c7f8b7ab05c2659d88dfa
Component: engine
2016-09-08 10:42:15 -04:00
29459f6822 Windows: docker top implementation
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52f0474851298e7ba70b1a7ea16e3421d5926c98
Component: engine
2016-09-07 16:29:02 -07:00
f5573135ab Allow windows environment variables to contain =
Fix issue where environment variables with embedded equals signs were
being dropped and not passed to the container.

Fixes #26178.

Signed-off-by: Matt Richardson <matt.richardson@octopus.com>
Upstream-commit: bc8eabce252e8363263e9baacdeb1de508029d06
Component: engine
2016-09-05 08:49:07 +10:00
17447fd1b0 correct some nits in comment and test files
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 52637848a769b8c80d2f1e28d3d34ada6d35b5a6
Component: engine
2016-08-29 18:37:14 +08:00
f5ce997d75 Fix minor typo
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d56c2ea9edf0a6f5abfb5be8d241ecf8375054ff
Component: engine
2016-08-17 16:10:01 -07:00
6c683fac48 Replace old oci specs import with runtime-specs
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
97adc78725 Revendor hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
2016-08-16 17:28:49 -07:00
5fafd959b5 Fixing race in Windows container servicing
There exists a race in container servicing on Windows where, during normal operation, the container will begin to shut itself down while docker calls shutdown explicitly.  If the former succeeds just as the latter is attempting to communicate with the container to request the shutdown, an error comes back that can cause the servicing to incorrectly register as a failure.  Instead, we just wait for the servicing container to shutdown on it's own, using a reasonable timeout to allow for merging in the updates.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 6591a37aaffa36b857db4b8c91b8f55942ab5730
Component: engine
2016-08-15 14:32:50 -07:00
c57bbdb1c7 Merge pull request #25505 from darrenstahlmsft/SignalProcessNewAPI
Changed SignalProcess to use new hcsshim API
Upstream-commit: 92ef3f615a95c0359f7abfc5f686d5e0392dd48b
Component: engine
2016-08-11 23:21:31 +02:00
cb1c855c27 Merge pull request #23951 from allencloud/defer-os-file-close
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
2016-08-10 11:07:15 -07:00
1c502571ef add defer file.Close to avoid potential fd leak
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
2016-08-10 08:36:09 +08:00
fe7b1d72f0 Merge pull request #23391 from Microsoft/WindowsSandboxSize
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
2016-08-09 15:34:39 +02:00
7df2db6c39 Changed SignalProcess to use new hcsshim API
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 5eaf86c6db0ee010f1a2996d9a9ce3abae444ba7
Component: engine
2016-08-08 14:03:12 -07:00
0c4a3deec0 Merge pull request #25072 from mlaventure/oos-libcontainerd-client
Handle out-of-sync libcontainerd client on restore
Upstream-commit: 6401bd65b11931a27a6d2e1d3b6a9278ed4e8fc7
Component: engine
2016-08-05 14:23:25 -07:00
c1636749f7 libcontainerd: mark container exited after failed restart
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9be0fb45c25e4d8d3cf0aa444da5ae41dd18f435
Component: engine
2016-08-03 17:44:30 -07:00
3eeb6b8c6e libcontainerd: wait for restart after state change
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 495448b2903c1a765cc17dff05afebe16a466917
Component: engine
2016-08-03 15:28:07 -07:00
8e4d2991bb Handle out-of-sync libcontainerd client on restore
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 51f21a1674c60108f97878815046c69f769cee48
Component: engine
2016-07-28 11:26:07 -07:00
665067dce6 Check if the container is running if no event
When there is no event for the container it can happen because of a
crash and the container state on the persistent disk will have a
mismatch between what was in `/run` ( machine crash ).

This situation will create an unkillable container in docker because
containerd does not see it and it is not running but docker thinks it is
and you cannot tell it anything different.

This fixes the issue by checking if containerd has the container running
if we do not have an event instead of just returning.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2650b1b6abd87d7d888e27abd6110dea83dcd080
Component: engine
2016-07-28 11:17:02 -07:00
e4e65a85a5 Fix daemon panic on restoring containers
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c75de8e33cc0db5236eef6146f2de06533b46aa8
Component: engine
2016-07-26 22:52:52 -04:00
0000093b60 Fix missing unlock in libcontainerd.Restore()
This was preventing the "exit" event to be correctly processed during
the restore process without live-restore enabled.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: ac068a1f9de2b20b145b5682cd514c1f6b1fac17
Component: engine
2016-07-22 15:21:10 -07:00
1dd4a36c0e Prepend libcontainerd log message with "libcontainerd:"
This will make it easier to pinpoint error messages in the daemon
logs.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 5231c5534679206e20672ca16bbee5c10d699319
Component: engine
2016-07-22 15:20:14 -07:00
ac1b563dd3 Update libcontainerd.AddProcess to accept a context
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: c02f82756e914081543bf05cb1815a48c02b1ebd
Component: engine
2016-07-19 08:24:39 -07:00
32ecbd59e9 Do not rely on "live" event anymore
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 64483c3bdaa1887b8b932e0564362fbbff025dc0
Component: engine
2016-07-19 08:24:39 -07:00
7262ef8faa Vendor in new containerd
This version introduces the following:
 - uses nanosecond timestamps for event
 - ensure events are sent once their effect is "live"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 29b2714580d085533c29807fa337c2b7a302abb6
Component: engine
2016-07-18 11:44:24 -07:00
918edfff9f Wait for the reader fifo opening to block
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0b2023130e285a0207be9fda4b22e1419997c552
Component: engine
2016-07-14 10:14:53 -07:00
8de09a35ce Merge pull request #24593 from mlaventure/fix-libcontainerd-data-race
Fix data race in libcontainerd
Upstream-commit: 0a96ba8a0f6b98d82fe2f8f4e07838785cb8d708
Component: engine
2016-07-14 17:27:24 +02:00
8a49e1f925 Fix data race in libcontainerd
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8e9fbc8f5fc5759eb7f26ec998f227994ff6c642
Component: engine
2016-07-13 10:04:42 -07:00
53c33cc1be Add --oom-score-adjust to daemon
This adds an `--oom-score-adjust` flag to the daemon so that the value
provided can be set for the docker daemon's process.  The default value
for the flag is -500.  This will allow the docker daemon to have a
less chance of being killed before containers do.  The default value for
processes is 0 with a min/max of -1000/1000.

-500 is a good middle ground because it is less than the default for
most processes and still not -1000 which basically means never kill this
process in an OOM condition on the host machine.  The only processes on
my machine that have a score less than -500 are dbus at -900 and sshd
and xfce( my window manager ) at -1000.  I don't think docker should be
set lower, by default, than dbus or sshd so that is why I chose -500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a894aec8d81de5484152a76d76b80809df9edd71
Component: engine
2016-07-12 15:53:15 -07:00
b02186b3ad Merge pull request #24156 from Microsoft/jjh/clearbasefs
Windows: Clear volume path for Hyper-V containers
Upstream-commit: efcf24f0c41412c196390d7208f908d6fc7b9ed6
Component: engine
2016-07-07 15:35:14 -07:00
0bdbf282f3 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
37fb9cfa09 Windows: Ensure VolumePath is not set for Hyper-V containers
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fd4f5c23650799a7e76e193614bf82454b375fe3
Component: engine
2016-06-29 16:49:09 -07:00
5fab4e7492 Windows: Disable VM cloning for TP5 image
The Windows TP5 image is not compatible with the Hyper-V isolated
container clone feature. Detect old images and pass a flag specifying that
clone should not be enabled.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 8e3432225357128fc135c8c3cf0318bd944c0c3b
Component: engine
2016-06-24 16:12:44 -07:00
fed645b1f8 Merge pull request #23862 from LK4D4/fix_unused
all: fix usage of some variables
Upstream-commit: c9175a6deb70887afc757702a69bf750b9668fd4
Component: engine
2016-06-23 10:21:10 -07:00
ebb89af810 Merge pull request #23776 from Microsoft/ShutdownError
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00