e148e763b8
Update native execdriver to exploit libcontainer hooks
...
Using @mavenugo's patch for enabling the libcontainer pre-start hook to
be used for network namespace initialization (correcting the conflict
with user namespaces); updated the boolean check to the more generic
SupportsHooks() name, and fixed the hook state function signature.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-09-16 12:51:14 -04:00
abd72d4008
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-27 22:07:42 -07:00
10305dc5e8
Add unless-stopped restart policy
...
Fixes #11008
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-18 11:39:06 -07:00
c0391bf554
Split reader interface from logger interface
...
Implement new reader interface on jsonfile.
Moves jsonlog decoding from daemon to jsonfile logger.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-21 20:47:31 -04:00
af7f81878f
Show error message when todisk failed
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-02 18:24:35 +08:00
624bf81fdb
Add RestartPolicy methods instead of using strings checking
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-16 14:15:28 +02:00
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-26 23:22:04 +01:00
b80fae7356
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 18:19:59 +01:00
b6a42673ab
Wait for copier finishing it's work before closing logger
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-18 13:48:01 -07:00
47a6afb93f
Default 'json-file' logging driver and none logging driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 12:13:21 -07:00
906974b185
correct some daemon spelling mistakes
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-13 05:14:56 -04:00
7a9c944b82
Removing dependencies from pkg into Docker internal code
...
Closes #10922
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-23 18:43:10 +00:00
e7f6433109
Remove explicit setting of ExitCode
...
That will be set in defer anyway. Also there was race between setting
ExitCode and inspect.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-29 14:50:42 -08:00
e721ed9b53
restart: Fix the compare of restart policy
...
Since the failure count of container will increase by 1 every time it
exits successfully, the compare in function shouldRestart() will stop
container to restart by the last time.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-01-13 13:05:30 +08:00
af053ccf6b
restart: Fix an error about arguments missing
...
Function shouldRestart() checks the restart policy and records the
debug info and there should be two arguments in the log.Debugf().
Prior to the this patch, the logs were something like this:
- client: $ docker run --restart=on-failure:3 ubuntu /bin/sh -c 'exit 1'
- daemon: INFO[0168] ...
DEBU[0168] stopping restart of container %!s(int=3) because maximum
failure could of %!d(MISSING) has been reached
INFO[0086] ...
Btw, fix a spelling error in the same file:
- cotnainer -> container
----------------------------------------
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-01-06 12:25:39 +08:00
44cab4a4ff
Add "OOM killed" event based on OOM state information
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-12-23 18:22:31 -05:00
46f2944977
Address comments.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-11-08 00:14:08 +00:00
f96e04ffc7
This patch adds ability in docker to detect out of memory conditions in containers.
...
Since the containers can handle the out of memory kernel kills gracefully, docker
will only provide out of memory information as an additional metadata as part of
container status.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-11-08 00:14:08 +00:00
69a5b827dc
See #8379 - if the container doesn't start I added code to make sure that if no other processing sets the container.exitCode to a non-zero value when we make sure its done before we return. I also made sure that while trying to start the CMD/ENTRYPOINT, if it fails, then we set the container.exitCode to the exitStatus from the exec().
...
Closes #8379
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-05 18:23:42 -08:00
ee7dd44c01
Mass gofmt
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:11:48 -07:00
7c62cee51e
Use logrus everywhere for logging
...
Fixed #8761
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:03:06 -07:00
bfc9d8bbea
Fix typo:betweem->between and PtySlace->PtySlave
...
Signed-off-by: Arika Chen <eaglesora@gmail.com>
2014-09-30 07:22:09 -04:00
e0339d4b88
Use State as embedded to Container
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-03 00:01:11 +04:00
3a7e07355a
Rename 'StdConfig' to 'StreamConfig'.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-01 14:31:01 -07:00
4aa5da278f
Refactoring execdriver.Command and Container structs to support 'docker exec' and other
...
similar features in the future.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-01 14:30:16 -07:00
517ba44e37
Merge Container and State mutexes
...
Resolved all deadlocks and fixed race between kill and
monitor.resetContainer
Fixes #7600
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-29 12:56:04 +04:00
12ff89a390
Fix race condition between cleanup and Start
...
There was problem when Start might be before cleanup
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-26 20:57:12 +04:00
0d4d7e4a28
Cleanup: Make channels unbuffered
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:25 +04:00
93d6adf8a1
Fix race between container cleanup and inspect/ps
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:06 +04:00
1480168e9f
Fix race condition in sending started signal from monitor
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:50:56 +04:00
a0392324f1
another commit to do like @crosbymichael
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-14 01:36:26 +00:00
25c519e829
Deprecate --restart on the daemon
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 16:08:50 -07:00
73ced63680
Update based on comments from the code review
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:55 -07:00
2ec1b697c1
Rebased changes to return on first start's error
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:55 -07:00
ebf5d4657d
Reguardless of success reset time increment
...
Reset the time increment if the container's execution time is greater
than 10s or else as a container runs and is restarted the time will grow
overtime.
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
972c894931
Improve wait during restart
...
We need to do this so that when a user asks docker to stop the container
and it is currently in the restart loop we don't want to have to wait
for the duration of the restart time increment before ack. the stop.
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
c4a00d549d
Honor the restarting state in Stop
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
a2afb2b1e3
Add Restarting state when docker is handling the restart of containers
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
be22d7ac2d
Add additional comments for vague lines
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
6ae05936e1
Move container start event into monitor
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
b7550cd456
Fix rebase around log event
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
41870a42be
Only restart containers on daemon load with policy of always
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
860c13b788
Add documentation and update restart rules.
...
Implement time backed backoff for restarting and fix failure count when
the maximum is 0
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:57:37 -07:00
2b0776c883
Refactor container monitor into type
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:56:53 -07:00
Madhu Venugopal
Morgan Bauer
Tonis Tiigi
Brian Goff
Qiang Huang
Antonio Murdaca
Alexander Morozov
Yuan Sun
Srini Brahmaroutu
HuKeping
Phil Estes
Vishnu Kannan
Doug Davis
ArikaChen
Alexandr Morozov
Victor Vieux
Michael Crosby