Alexander Larsson
572b1fd9be
devmapper: Fix major/minor extraction
...
The way devices are mapped is a bit more complex than before.
This implements the method from new_decode_dev in:
https://github.com/mirrors/linux-2.6/blob/master/include/linux/kdev_t.h
Which is what is needed on kernels > 2.6
2013-10-18 11:38:21 +02:00
Solomon Hykes
4756ad248a
devmapper: use major,minor of underlying device in devmapper device name, for readability.
2013-10-18 08:30:53 +00:00
Solomon Hykes
dfb77274ce
devmapper: clearer make the 'unknown base hash' error message more understandable
2013-10-18 08:22:42 +00:00
Solomon Hykes
73545199a8
Merge remote-tracking branch 'alexlarsson/dm-status' into dm
...
Conflicts:
devmapper/deviceset.go
2013-10-18 07:17:13 +00:00
Solomon Hykes
0ad35c6746
devmapper: cleanup error reporting
2013-10-18 07:09:13 +00:00
Solomon Hykes
5e363072f5
Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm
2013-10-18 06:51:50 +00:00
Solomon Hykes
cad913c57b
devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts
2013-10-18 06:48:20 +00:00
Solomon Hykes
5f58a1fbe4
hack: encode the name of the current test in temporary directories, for easier tracking
2013-10-18 06:47:08 +00:00
Solomon Hykes
07e09d57af
Increase readbility of unit tests by using mkRuntime everywhere
2013-10-18 06:44:30 +00:00
Solomon Hykes
9f85a967bb
Merge pull request #2269 from alexlarsson/dm-blocksize
...
devmapper: Use a smaller blocksize for the thin-pool
2013-10-17 22:50:33 -07:00
Solomon Hykes
85a36b3b53
devmapper: rename deviceset_devmapper.go to deviceset.go
2013-10-18 05:19:22 +00:00
Solomon Hykes
d3505d836a
Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm
...
Conflicts:
devmapper/deviceset_devmapper.go
2013-10-18 03:40:46 +00:00
Solomon Hykes
c47e93fcbe
Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct
2013-10-18 03:32:47 +00:00
Solomon Hykes
5cd7de5de8
hack: fail tests if there are leftover temp files before or after
2013-10-18 03:31:21 +00:00
Solomon Hykes
d034aafac7
devicemapper: Add fixme
2013-10-18 00:58:20 +00:00
Solomon Hykes
4bd6021806
devmapper: Rename DeviceSetDM to DeviceSet
2013-10-18 00:07:56 +00:00
Solomon Hykes
ed03dbfe82
Don't add /.docker-id to the container filesystem
2013-10-18 00:07:46 +00:00
Solomon Hykes
330062ef72
Remove race condition caused by double-destroy in 2 tests
2013-10-17 23:59:59 +00:00
Guillaume J. Charmes
31b883b076
Add error checking and error messages
2013-10-17 15:04:14 -07:00
Guillaume J. Charmes
bdb3b2a88c
Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir
...
devicemapper: Use device/inode of the root dir, not the image
2013-10-17 11:54:40 -07:00
Alexander Larsson
a14496ce89
Devmapper: Mount images readonly when calculating changes
...
There is no need to have this be writable, and there is a chance
that e.g. atime updates will cause writes to the image which is
bad for disk use wrt sharing between all containers.
2013-10-17 16:14:53 +02:00
Alexander Larsson
8abcc8e713
devmapper: Use a smaller blocksize for the thin-pool
...
As per the thin provisioning docs for creating the pool:
$data_block_size gives the smallest unit of disk space that can be
allocated at a time expressed in units of 512-byte sectors.
$data_block_size must be between 128 (64KB) and 2097152 (1GB) and a
multiple of 128 (64KB). $data_block_size cannot be changed after the
thin-pool is created. People primarily interested in thin provisioning
may want to use a value such as 1024 (512KB). People doing lots of
snapshotting may want a smaller value such as 128 (64KB).
The switch from 512 (which we used before) to 128 (recommended above
for lots of snapshoting) means a simple container creation (based on the
mattdm/fedora:f19 image) adds 1 MB of diskspace rather than 3.6.
This seems more in tune with how docker is typically used.
2013-10-17 15:33:00 +02:00
Alexander Larsson
d733cdcebb
Show devicemapper status in "docker info"
...
This shows the current global diskspace use in "docker info"
2013-10-17 15:32:07 +02:00
Alexander Larsson
0aee096fd7
TarFilter: Fix leak of tmpfiles
...
We were leaking the temporary directory that we create in TarFilter,
because the "tmpDir, err := ioutil.TempDir()" call overrides the
tmpDir in the outer scope with a new locally scoped variable.
This means tmpDir is always "" when the cleanup function is called.
Also, we did not call the atExit() function if CmdStream had an
error early on.
On errors in CmdStream(),
2013-10-17 14:46:58 +02:00
Alexander Larsson
e6a73e65a2
devicemapper: Use device/inode of the root dir, not the image
...
This way the devicemapper prefix stays stable even if we're not
using loopback mounted devices.
2013-10-17 09:53:09 +02:00
Solomon Hykes
ad2fbd9e87
devmapper: error reporting workaround in waitRemove()
2013-10-17 01:49:51 +00:00
Solomon Hykes
e5d7472a0d
devmapper: small fixes in error reporting
2013-10-17 01:49:27 +00:00
Solomon Hykes
7d3c7e2b29
devmapper: debug messages
2013-10-17 01:47:03 +00:00
Solomon Hykes
f1d07e2dbe
devmapper: prefix device names with the dev_id+inode of the data image
2013-10-17 01:46:28 +00:00
Solomon Hykes
ad968ef3ef
devmapper: add useful comments
2013-10-17 01:42:05 +00:00
Solomon Hykes
c688e9b5a6
devmapper: debug messages
2013-10-16 23:27:33 +00:00
Solomon Hykes
f3e6d34df2
hack: cleanup devicemapper at the last test
2013-10-16 23:27:00 +00:00
Solomon Hykes
ea04f3de72
devmapper: wait for devices to be effectively removed before returning a successful remove
2013-10-16 23:26:37 +00:00
Solomon Hykes
153248b60f
devicemapper: remove unused code
2013-10-16 23:23:35 +00:00
Solomon Hykes
1711de4b09
devmapper: wait for devices to be effectively unmounted before removing them
2013-10-16 23:06:07 +00:00
Solomon Hykes
11d695a297
Add debug messages while testing devicemapper
2013-10-16 20:45:59 +00:00
Solomon Hykes
acf58362cb
Hack: fix tests which didn't cleanup properly
2013-10-16 20:44:15 +00:00
Guillaume J. Charmes
3a246ac3d1
Change default values for devicemapper as variable instead of env
2013-10-16 20:42:50 +00:00
Solomon Hykes
1da335f784
Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests
2013-10-16 20:10:20 +00:00
Solomon Hykes
cd61fb2e6f
WIP: debugging dm-base-hash + dm-refactor-init
2013-10-15 23:56:04 +00:00
Solomon Hykes
fdba1aeed8
Merge branch 'dm-refactor-init' into dm
...
Conflicts:
runtime_test.go
2013-10-15 23:27:28 +00:00
Solomon Hykes
c9f3e54c31
Merge branch 'dm-base-hash' into dm
2013-10-15 23:09:26 +00:00
Solomon Hykes
3997b8a923
hack: don't set DEBUG when running tests
2013-10-15 23:07:26 +00:00
Solomon Hykes
ec885d9180
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
2013-10-15 23:06:41 +00:00
Solomon Hykes
54b0cd7cd1
Merge branch 'dm-missing-mapper' into dm
2013-10-15 22:51:20 +00:00
Solomon Hykes
66db2ac9d8
Merge branch 'dm-fix-test-2' into dm
2013-10-15 22:42:49 +00:00
Alexander Larsson
5ebaca7e55
devmapper: create device nodes 'on create' instead of 'on resume'
2013-10-15 21:27:47 +00:00
Solomon Hykes
432ff7e3c3
Merge pull request #2227 from dotcloud/dm-rename-loopback
...
Rename loopback dir to devicemapper
2013-10-15 12:23:43 -07:00
Michael Crosby
80bd64245f
Add filesystemtype for containers
...
If no type is specified then assume aufs.
2013-10-15 11:49:13 -07:00
Michael Crosby
4431e9edb7
Rename loopback dir to devicemapper
2013-10-15 11:30:06 -07:00