Commit Graph

3710 Commits

Author SHA1 Message Date
cc3628cab5 hack: encode the name of the current test in temporary directories, for easier tracking
Upstream-commit: 5f58a1fbe4733c1415046d6e16afd17a41b595a8
Component: engine
2013-10-18 06:47:08 +00:00
e20e669277 Increase readbility of unit tests by using mkRuntime everywhere
Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b
Component: engine
2013-10-18 06:44:30 +00:00
66093eff84 devmapper: rename deviceset_devmapper.go to deviceset.go
Upstream-commit: 85a36b3b53f39e13bba9d69a486758b68301d503
Component: engine
2013-10-18 05:19:22 +00:00
19207ea5e6 Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm
Conflicts:
	devmapper/deviceset_devmapper.go
Upstream-commit: d3505d836ac98a95b2129206844b6e4d6ad24927
Component: engine
2013-10-18 03:40:46 +00:00
f6aee57647 Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct
Upstream-commit: c47e93fcbeda6c1c29a95b6d0deb23f5d03a07ed
Component: engine
2013-10-18 03:32:47 +00:00
4e4f3e50fd hack: fail tests if there are leftover temp files before or after
Upstream-commit: 5cd7de5de8fddd5868c6b85ed1e4f46228c82672
Component: engine
2013-10-18 03:31:21 +00:00
1f33220276 devicemapper: Add fixme
Upstream-commit: d034aafac7a9db601b8affd61a28c762be6b6c31
Component: engine
2013-10-18 00:58:20 +00:00
d24b97a314 devmapper: Rename DeviceSetDM to DeviceSet
Upstream-commit: 4bd6021806985b48b872aa9dbe2d0183675eac1d
Component: engine
2013-10-18 00:07:56 +00:00
27c3cb7365 Don't add /.docker-id to the container filesystem
Upstream-commit: ed03dbfe82f4481ea3845071606ef25c7ea2ec3e
Component: engine
2013-10-18 00:07:46 +00:00
8e5b6c7d93 Remove race condition caused by double-destroy in 2 tests
Upstream-commit: 330062ef723f66ed8a640627f983e586f46df03a
Component: engine
2013-10-17 23:59:59 +00:00
5c8226fc06 Add error checking and error messages
Upstream-commit: 31b883b07641bfab721a05f0a68629c79b74a058
Component: engine
2013-10-17 15:04:14 -07:00
cdce39d789 Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir
devicemapper: Use device/inode of the root dir, not the image
Upstream-commit: bdb3b2a88c0379942e3e10f4e44b7d69a96b49d2
Component: engine
2013-10-17 11:54:40 -07:00
efce3d8602 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.
Upstream-commit: a14496ce891f1f09b10f0459550e8fe095b477b5
Component: engine
2013-10-17 16:14:53 +02:00
79b5685703 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(),
Upstream-commit: 0aee096fd73676e2548e3bf132770f1692ac47dd
Component: engine
2013-10-17 14:46:58 +02:00
9f21580deb 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.
Upstream-commit: e6a73e65a23163273fa63d54b8f12530f7eef104
Component: engine
2013-10-17 09:53:09 +02:00
d2fc2c3021 devmapper: error reporting workaround in waitRemove()
Upstream-commit: ad2fbd9e873915d9d09685887eb0afe16b9559a4
Component: engine
2013-10-17 01:49:51 +00:00
cff980c7fc devmapper: small fixes in error reporting
Upstream-commit: e5d7472a0d0268957eebbc385005d6b69c442270
Component: engine
2013-10-17 01:49:27 +00:00
379a09a137 devmapper: debug messages
Upstream-commit: 7d3c7e2b297badc152213cae1e6a11f64a7691b4
Component: engine
2013-10-17 01:47:03 +00:00
d0feec3427 devmapper: prefix device names with the dev_id+inode of the data image
Upstream-commit: f1d07e2dbe41a3a4f9b8ee1de544fc9c2de88c60
Component: engine
2013-10-17 01:46:28 +00:00
0563e530aa devmapper: add useful comments
Upstream-commit: ad968ef3ef54f3161e8e1012f0ef20b8757ac0aa
Component: engine
2013-10-17 01:42:05 +00:00
1dde114e36 devmapper: debug messages
Upstream-commit: c688e9b5a61c1979d497cfe9cba0a6099aad63e8
Component: engine
2013-10-16 23:27:33 +00:00
38810afde9 hack: cleanup devicemapper at the last test
Upstream-commit: f3e6d34df23adf84f520b058e4363f8b789d2ebf
Component: engine
2013-10-16 23:27:00 +00:00
43f0475727 devmapper: wait for devices to be effectively removed before returning a successful remove
Upstream-commit: ea04f3de72ab97c9f9e49e46e049bf0cde58ac55
Component: engine
2013-10-16 23:26:37 +00:00
45b9d24be0 devicemapper: remove unused code
Upstream-commit: 153248b60f551d4cb92bce4f35b08084f554c62c
Component: engine
2013-10-16 23:23:35 +00:00
c659ac4a84 devmapper: wait for devices to be effectively unmounted before removing them
Upstream-commit: 1711de4b0996a6fd668f1d1ba07901d04f090810
Component: engine
2013-10-16 23:06:07 +00:00
d7aa3ef25d Add debug messages while testing devicemapper
Upstream-commit: 11d695a2973d67906145e7f0972b6e693bdaa3f9
Component: engine
2013-10-16 20:45:59 +00:00
64572038db Hack: fix tests which didn't cleanup properly
Upstream-commit: acf58362cb957bf4d02af460935a9c5febd112f4
Component: engine
2013-10-16 20:44:15 +00:00
e0dfea89d2 Change default values for devicemapper as variable instead of env
Upstream-commit: 3a246ac3d1368931998a082043c9b719dd3c10cd
Component: engine
2013-10-16 20:42:50 +00:00
9c9b801114 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests
Upstream-commit: 1da335f784882292fb55b25bf255ec5f45072ea4
Component: engine
2013-10-16 20:10:20 +00:00
05176434d1 WIP: debugging dm-base-hash + dm-refactor-init
Upstream-commit: cd61fb2e6f9d2a7bbd3c4db2ab9091674746126d
Component: engine
2013-10-15 23:56:04 +00:00
58a19a7d93 Merge branch 'dm-refactor-init' into dm
Conflicts:
	runtime_test.go
Upstream-commit: fdba1aeed8c80b3c2f8cd14c3b393581e7ef99a8
Component: engine
2013-10-15 23:27:28 +00:00
990549480d Merge branch 'dm-base-hash' into dm
Upstream-commit: c9f3e54c3148aeaaa668bcdff184e14d016d2613
Component: engine
2013-10-15 23:09:26 +00:00
560c0ccd10 hack: don't set DEBUG when running tests
Upstream-commit: 3997b8a923c3e95c14237657f0e2c9301fc5f66d
Component: engine
2013-10-15 23:07:26 +00:00
242fae9ab3 hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Upstream-commit: ec885d91806595add47c793e1e6bb8a4b9e8d100
Component: engine
2013-10-15 23:06:41 +00:00
9549f4f9e3 Merge branch 'dm-missing-mapper' into dm
Upstream-commit: 54b0cd7cd1cbea8ca35716bd1b4a20a1900029f4
Component: engine
2013-10-15 22:51:20 +00:00
80b9a304af Merge branch 'dm-fix-test-2' into dm
Upstream-commit: 66db2ac9d8176a847936afbad901e97249c27f37
Component: engine
2013-10-15 22:42:49 +00:00
3dc4429624 devmapper: create device nodes 'on create' instead of 'on resume'
Upstream-commit: 5ebaca7e55e006083e6e9c2782e4f8b421275579
Component: engine
2013-10-15 21:27:47 +00:00
b68cf98632 Merge pull request #2227 from dotcloud/dm-rename-loopback
Rename loopback dir to devicemapper
Upstream-commit: 432ff7e3c3be315b475c59310c1d3889f361f744
Component: engine
2013-10-15 12:23:43 -07:00
246243d186 Add filesystemtype for containers
If no type is specified then assume aufs.
Upstream-commit: 80bd64245f14d4d8a6fc8349cff8b441d770da42
Component: engine
2013-10-15 11:49:13 -07:00
821d8910fe Rename loopback dir to devicemapper
Upstream-commit: 4431e9edb7cf49ec7da8201da1221b5b03ea09ee
Component: engine
2013-10-15 11:30:06 -07:00
5b6d6020fa Initialize devicemapper in NewRuntimeFromDIrectory
Upstream-commit: 7093411a8dd36612ddc636c14395e33ecff47f7f
Component: engine
2013-10-15 03:53:48 +00:00
3b33148b08 Make sure the base device is well created before running the tests
Upstream-commit: 5778ed7db2fee3b7005a53a06d010272504924e9
Component: engine
2013-10-14 18:36:18 -07:00
ceadf83972 Use incrementing prefix on pool and loopback to allow dind
Upstream-commit: 3455c1a0983ae74d22b05abc3c0552460c6a2710
Component: engine
2013-10-14 17:48:43 -07:00
b5fc16147b Ignore cleanup with /dev/mapper does not exist
Upstream-commit: 5dd12ba20a962c0f67e5eefb7b0e00e5caccb1e1
Component: engine
2013-10-14 14:23:58 -07:00
7b24c05ec6 Merge pull request #2199 from alexlarsson/dm-docs
Add some docs for newly exported functions
Upstream-commit: 5892c8e46950268faa9cc02b611a71d0a182d47c
Component: engine
2013-10-14 13:33:21 -07:00
2718936441 Merge pull request #2200 from alexlarsson/dm-remove-unused
Runtime: Remove unused funtion hasFilesystemSupport()
Upstream-commit: 20e3e8c07d0ac9927d7c74a8edc6742874c32a78
Component: engine
2013-10-14 13:24:53 -07:00
4088975de9 Merge pull request #2182 from dotcloud/cleanup-dm-unittests
Clean up better from previous unit-test runs
Upstream-commit: 79c0c4470f095cf30138dd4b5f19ad737497e9bd
Component: engine
2013-10-14 12:29:59 -07:00
83a87303bf Merge pull request #2183 from dotcloud/migrate-aufs
Migrate aufs to new device mapper backend
Upstream-commit: 4dedd9a9aac47669df24c9c6c96e2e3a6b28ed0d
Component: engine
2013-10-14 12:28:28 -07:00
3254b3eb55 Merge pull request #2184 from dotcloud/dm-rmi
Do not allow image to be deleted when containers are dependent
Upstream-commit: 063ebbab68e966545f534827fbc371c19dd1064e
Component: engine
2013-10-14 12:27:19 -07:00
1bca3c7d07 Add error return to cleanup, use os.OpenFile instead of syscall.Open, Make sure the pools are removed after all other devices
Upstream-commit: ea92dc2e8c42c4387eccf1ebb88e20ccc92c1853
Component: engine
2013-10-14 12:26:46 -07:00