Alexander Morozov
ab6ce6666a
Merge pull request #13151 from Mic92/master
...
zfs: update filesystem cache on filesystem creation/deletion
Upstream-commit: 445afe09770bccbb9929f5e05c47d73a1d59298a
Component: engine
2015-05-12 10:53:01 -07:00
Alexander Morozov
f387cad768
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
Upstream-commit: c9821d8dd629cbd4fc0b11c9f593267042c2d718
Component: engine
2015-05-12 10:32:01 -07:00
Alexander Morozov
baa93a3d54
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad
Component: engine
2015-05-12 10:27:43 -07:00
Sebastiaan van Stijn
b60e82567d
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
2015-05-12 09:40:16 -04:00
Jörg Thalheim
9a838129e5
zfs: update filesystem cache on filesystem creation/deletion
...
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.
Fixes #13142
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 2cb23527e4f3f74a9fb98ddc7c0c11c50c3f07d2
Component: engine
2015-05-12 13:06:41 +02:00
Qiang Huang
71b540c581
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a8250a0b20006bae669f9d127eaf00d4284e1d9f
Component: engine
2015-05-12 18:02:30 +08:00
Sebastiaan van Stijn
6a33f440dd
Merge pull request #10786 from estesp/add-goroutine-debug
...
Add capability for goroutine dumping on SIGQUIT/USR1
Upstream-commit: a5007e5737fac5904b61f49c8a7fd6fc29f83330
Component: engine
2015-05-11 21:20:44 -04:00
Phil Estes
c0e7d1e48e
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 95fcf76cc64a4acf95c168e8d8607e3acf405c13
Component: engine
2015-05-12 10:09:23 +10:00
Tibor Vass
5a91f639c0
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
2015-05-11 16:53:17 -07:00
Sven Dowideit
b4bae162cd
Merge pull request #13137 from SvenDowideit/need-more-sudo
...
Need more sudo
Upstream-commit: c49695f976ab97dc8c7a249f5211d9e0fcb2c24c
Component: engine
2015-05-12 09:07:55 +10:00
Sven Dowideit
56b6d8326b
Need more sudo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c5e93d095005e8b336b845cb94d95f55a594b3ce
Component: engine
2015-05-11 23:07:22 +00:00
Sven Dowideit
8422b7afff
Merge pull request #13134 from SvenDowideit/dhe-1.0.1-release
...
DHE 1.0.1 release
Upstream-commit: 34b976953824f5ec0237e6dc2d6c147a0547e992
Component: engine
2015-05-12 07:34:30 +10:00
Sven Dowideit
133eb58df5
DHE 1.0.1 release
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 38af208da1414dad81dbd96d7d8678bfb94f9dc0
Component: engine
2015-05-11 21:23:56 +00:00
Jessie Frazelle
478cbff61d
Merge pull request #13132 from LK4D4/fix_race_kill
...
Fix race between execdriver.Kill and execdriver.Run
Upstream-commit: a47fb5edca77536ea6ea024df0bc15978d172224
Component: engine
2015-05-11 14:01:07 -07:00
Alexander Morozov
c578ab5fb7
Fix race between execdriver.Kill and execdriver.Run
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ca7219f5daa194ae714c3a3396703e08d8a137c8
Component: engine
2015-05-11 13:23:50 -07:00
Jessie Frazelle
84543fc3ec
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
Antonio Murdaca
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
Michael Crosby
a9a448c762
Merge pull request #12994 from Microsoft/10662-fixinvocation
...
Windows: Fix builder\dispatchers.go
Upstream-commit: e66ad40c4e62d784e23e0df39de0970c5ced3917
Component: engine
2015-05-11 11:24:43 -07:00
Antonio Murdaca
12071c528f
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e2acca67c8e089429c8a5d5171887e5de42e3917
Component: engine
2015-05-11 19:56:41 +02:00
Alexander Morozov
ceedb9d4b8
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
Upstream-commit: 5e063326a345349b406791a6822f6423e17c353d
Component: engine
2015-05-11 10:54:39 -07:00
Jessie Frazelle
203bb4326e
Merge pull request #13091 from LK4D4/generate_caps
...
Generate caps
Upstream-commit: 92344602eadd6500f9936593772e46cf7db2b518
Component: engine
2015-05-11 10:42:59 -07:00
Ahmet Alp Balkan
365c18080f
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
2015-05-10 20:42:14 +00:00
Sebastiaan van Stijn
8647686396
Merge pull request #13111 from gianlucaborello/fix-mac-documentation
...
Correctly document MAC address generation
Upstream-commit: 4d6720bfbb0a2f88d4733ca2a3103e3160d0cd33
Component: engine
2015-05-10 13:43:27 -04:00
Alexander Morozov
240f5e3960
Merge pull request #13102 from duglin/MissingOK
...
Add missing "ok" on "comma ok" idiom in test util
Upstream-commit: 13064646a64cdc6772fe05ac4445d1498d76656a
Component: engine
2015-05-10 09:22:44 -07:00
Gianluca Borello
9784ed801a
Default MAC address generation is not random and should be stated in the documentation.
...
Signed-off-by: Gianluca Borello <g.borello@gmail.com >
Upstream-commit: e324f51e5b7bf9d28701af97bdb9fcdc26fc7699
Component: engine
2015-05-10 08:11:26 -07:00
Bharath Thiruveedula
fc89bcb4ca
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 8c1ef5ceafcba2476693db7f5db39300ad2e7f88
Component: engine
2015-05-10 00:16:54 +05:30
Alexander Morozov
a40ebffc52
Merge pull request #12988 from Mashimiao/remove-unused-container-functions
...
cleanup: remove unneeded locks
Upstream-commit: 340fd140e67901c8b5ad9d59c6fb693f6bbcffde
Component: engine
2015-05-09 09:42:27 -07:00
Alexander Morozov
ab315ef02f
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
2015-05-09 09:39:17 -07:00
Alexander Morozov
c55979eeda
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
Upstream-commit: 61cb6012e6b4085f9c867d826431368bb18896c8
Component: engine
2015-05-09 09:38:42 -07:00
Doug Davis
104194a4ef
Add missing "ok" on "common ok" idiom in test util
...
w/o this the "ok" we're checking is from the previous type assertion.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dd4693f67cb0ce5dc14c87ddf2a9a9f6a3406763
Component: engine
2015-05-09 05:56:10 -07:00
Sebastiaan van Stijn
1eea50823f
Merge pull request #12180 from Mashimiao/add-cpuperiod-and-cpuquota-support
...
add cpu.cfs_period_us support
Upstream-commit: 7699cee247664988868e9cab480e795dbea927cb
Component: engine
2015-05-08 22:32:09 -04:00
Ma Shimiao
87d85e4c09
cleanup remove unneeded locks
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: bcc24ec8ad26ebb3564eb462fd80654964ff4651
Component: engine
2015-05-09 10:06:53 +08:00
Ma Shimiao
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
John Howard
c39c5e2a47
Windows: reexec pkg supported
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 64715c4f33fdb98003b7fda8d1dcf9c65463de07
Component: engine
2015-05-08 14:15:53 -07:00
John Howard
669b8fe47b
Windows: Fix builder\dispatchers.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4d2f6fbde012f6b58345cc21eadcd619db83b292
Component: engine
2015-05-08 11:45:08 -07:00
Michael Crosby
9906aa5fe1
Merge pull request #12978 from Microsoft/10662-containerexeccreate
...
Windows: Split ContainerExecCreate
Upstream-commit: 3697dddc0d913d0d4468a1570408390a336d8b7b
Component: engine
2015-05-08 11:38:03 -07:00
Tianon Gravi
a9af2bce60
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
2015-05-08 12:33:33 -06:00
Alexander Morozov
11ef87f883
Generate capabilityList automatically
...
Generation based on CAP_LAST_CAP, I hardcoded
capability.CAP_BLOCK_SUSPEND as last for systems which has no
/proc/sys/kernel/cap_last_cap
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a559c1145af3162cd683866fd6f998ff5f57058f
Component: engine
2015-05-08 09:40:05 -07:00
Alexander Morozov
aaee340d81
Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
...
It adds List function for listing all supported caps
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5a2d592c27e93cf7f3d01216cf6e22656330fe84
Component: engine
2015-05-08 09:22:37 -07:00
Jörg Thalheim
30e28d31e0
zfs: retrieve all filesystems on startup at once
...
The docker graph call driver.Exists() on initialisation for each filesystem in
the graph. This results will results in a lot `zfs get all` commands. To reduce
this, retrieve all descend filesystem at startup and cache it for later checks
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: bad25ccf978b56da6fa181439504ab33906524cd
Component: engine
2015-05-08 17:49:39 +02:00
Jörg Thalheim
f9c00c527b
zfs: improve performance by using legacy mounts
...
instead of let zfs automaticly mount datasets, mount them on demand using mount(2).
This speed up this graph driver in 2 ways:
- less zfs processes needed to start a container
- /proc/mounts get smaller, so zfs userspace tools has less to read (which can
a significant amount of data as the number of layer grows)
This ways it can be also ensured that the correct mountpoint is always used.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 11e9167a6b45fdc134ee43e89abefd34a85cf624
Component: engine
2015-05-08 17:49:39 +02:00
Jörg Thalheim
d9d6332c5d
zfs: replace c for /proc/mounts parsing with go
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: ee00f07ea64074e8abf7d741eed8a83da4e4b5ff
Component: engine
2015-05-08 17:49:39 +02:00
Jörg Thalheim
01977b40d0
integration: add variable to set storage options for testing
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 30f3bd643d5f6706bbaa9559e781b036661f149e
Component: engine
2015-05-08 17:49:39 +02:00
Jörg Thalheim
2ed25719ce
zfs: refactor error handling
...
thanks to @calavera
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: dd614b5e34bc82c6921c44619532f2467ce43baa
Component: engine
2015-05-08 17:48:20 +02:00
Jörg Thalheim
59b313c381
zfs: add myself to MAINTAINERS
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: a25195d86cb54cbad0bfe840267beaa9f0a84c74
Component: engine
2015-05-08 17:48:20 +02:00
Jörg Thalheim
9c30c1f4a1
docs: move zfs.fsname option to storage option section
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: bdf784ae4ae62a560f28e974ff9b9c26aaf8a533
Component: engine
2015-05-08 17:48:20 +02:00
Jörg Thalheim
289cc2a20f
zfs: revert to NaiveGraphDriver for the moment
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: bacecabf3be2d6b180cbe8fc37ff90f79138bb6e
Component: engine
2015-05-08 17:48:20 +02:00
Jörg Thalheim
e5820ed7e4
Implement Docker on ZFS
...
Signed-off-by: Arthur Gautier <baloo@gandi.net >
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
2015-05-08 17:48:20 +02:00
Alexander Morozov
0d41ea39ed
Merge pull request #13071 from tianon/explicit-vendor
...
Update "hack/vendor.sh" to be more explicit
Upstream-commit: 23abd51ef15b2c0138e272708845750be5eb0b03
Component: engine
2015-05-08 08:22:17 -07:00
Brian Goff
450b717836
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
Upstream-commit: af9dac9627e7b04a803df152cc24f0db073ea17a
Component: engine
2015-05-07 22:07:41 -04:00