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
ef6f38c75b
Do not allow image to be deleted when containers are dependent
...
Upstream-commit: 7f429e0cebf9f7d0b203191646f2afa7b4bee35b
Component: engine
2013-10-14 09:47:01 -07:00
d4b9fc2a32
Runtime: Remove unused funtion hasFilesystemSupport()
...
This used to be used to be used to detect AUFS support, but is not
used anymore.
Upstream-commit: bb42801cdcd0924ada0ff5ccb3a84aa9a1cbd916
Component: engine
2013-10-14 10:54:50 +02:00
db72642777
Add some docs for newly exported functions
...
Upstream-commit: 8e4b3a33906785c3181151cc46bb323952f6eb2b
Component: engine
2013-10-14 10:53:12 +02:00
c072ec522a
Change the base filesystem size in unit tests
...
Upstream-commit: 48070274ee93bf0d4cef7486a4ec19c4d97ac9ce
Component: engine
2013-10-12 15:06:53 -07:00
0e3ebd255a
Allow loopback and base fs sizes set by env var
...
Upstream-commit: c3f1bb3287a10ed0d49f48630b92c69ff6ca4ff7
Component: engine
2013-10-11 20:37:11 -07:00
a829b7de69
Verbose migration add warning for running container
...
Conflicts:
hack/make.sh
runtime.go
runtime_test.go
Upstream-commit: 562e4f1e23a52cff05078f68e21199514ba58250
Component: engine
2013-10-11 17:11:18 -07:00
58c60c1584
Migrate AUFS containers to devmapper
...
Conflicts:
hack/make.sh
runtime.go
Upstream-commit: a263e07678c813af2a7b0859034cc76c9a888c7b
Component: engine
2013-10-11 16:54:08 -07:00
53581a197d
Clean up better from previous unit-test runs
...
This makes sure we unmount existing mounts (as well as removing the
devmapper devices), and it fails with proper logs rather than just
panic()ing.
Upstream-commit: e7986da531568040e0185aafce03cdae2169baac
Component: engine
2013-10-11 16:42:11 -07:00
f3a38555ac
device-mapper: Move all devicemapper spew to log through utils.Debugf().
...
Upstream-commit: b440ec0136793ebcfbf8d76e6cd16ccba0785382
Component: engine
2013-10-11 16:31:06 -07:00
ecfa6df5b6
devmapper: Move all "raw" libdevmapper wrappers to devmapper.go
...
This separates out the DeviceSet logic a bit better from the raw
device mapper operations.
devicemapper: Serialize addess to the devicemapper deviceset
This code is not safe to run in multiple threads at the same time,
and neither is libdevmapper.
DeviceMapper: Move deactivate into UnmountDevice
This way the deactivate is atomic wrt othe device mapper operations
and will not fail with EBUSY if someone else starts a devicemapper
operation inbetween unmount and deactivate.
devmapper: Fix loopback mounting regression
Some changes were added to attach_loop_device which added
a perror() in a place that caused it to override errno so that
a later errno != EBUSY failed. This fixes that and cleans up
the error reporting a bit.
devmapper: Build on old kernels without LOOP_CTL_GET_FREE define
Upstream-commit: c77697a45ca615f66351a7363e93c3903e92553f
Component: engine
2013-10-11 16:30:02 -07:00
715688eb5e
Merged master into device-mapper branch
...
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
2013-10-10 12:50:30 -07:00
9a01794c54
Merge pull request #2178 from tianon/vagrant-docker-group
...
Add vagrant user to the docker group
Upstream-commit: 42277d0329c62018019efc92a09a0a81c266b478
Component: engine
2013-10-11 15:10:50 -07:00
6443c6c995
Add vagrant user to the docker group
...
Upstream-commit: d62df6b2b587fce29eec769ab60efb81cf4062b5
Component: engine
2013-10-11 11:00:04 -06:00
5a263e053c
Merge pull request #2118 from karlgrz/936-enhance-logging
...
Add utils.Errorf for error logging
Upstream-commit: 97779ff7cfc2dbee34ad6741223534181079a6af
Component: engine
2013-10-11 08:51:37 -07:00
ff166898e1
Merge pull request #2169 from dotcloud/remove-deprecated-packaging
...
Remove deprecated packaging directory
Upstream-commit: 9afa48a92f7ffb0a2e4d6ccc7446180070a69010
Component: engine
2013-10-11 08:44:34 -07:00
b2ba4dc1a1
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
1bd54db78b
Merge pull request #2037 from tianon/install-script-revamp
...
Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.)
Upstream-commit: f15cd71bb8a60473318a97564bd4b061d8b9cf6d
Component: engine
2013-10-10 23:56:13 -07:00
b33972f66c
Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.), thus making it an official script and moving it to hack/
...
Upstream-commit: 94bf5b00112890ed84c38b9840802fa0142b507b
Component: engine
2013-10-11 00:53:15 -06:00
df618dc294
Merge pull request #2038 from tianon/mkimage-debian-fixes
...
Fix contrib/mkimage-debian.sh apt caching prevention
Upstream-commit: ee256ce6bfc08fbd6d04f5abd4c69f796145abb2
Component: engine
2013-10-10 17:59:17 -07:00
ae4bb19110
Merge pull request #2166 from pnasrat/document-approval
...
Clarify LGTM process to contributors.
Upstream-commit: 5fe699f8132a5b6d6f7c5a876f65416228ba9d37
Component: engine
2013-10-10 17:55:32 -07:00
38757f890c
Merge pull request #2159 from nathankleyn/fix-references-to-param-names
...
Small fixes to parameter names in docs for ADD command.
Upstream-commit: 7561e2570c8db781d9be04cdd0d57ec5c40c4a2c
Component: engine
2013-10-10 17:53:57 -07:00
Solomon Hykes
Guillaume J. Charmes
Alexander Larsson
Michael Crosby
Guillaume J. Charmes
Daniel Mizyrycki
Tianon Gravi
Karl Grzeszczak