Commit Graph

2096 Commits

Author SHA1 Message Date
Andrea Luzzardi
cb2ceea702 engine: Added a concurrent safe refresh delayer.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 11:32:03 -07:00
Andrea Luzzardi
f1782fed90 engine cleanup: Don't mess with the global random.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-07 17:27:41 -07:00
Victor Vieux
fe655270b9 Merge pull request #1263 from aluzzardi/refresh-loop
engine: More robust refresh loop.
2015-10-07 11:29:02 -07:00
Andrea Luzzardi
13483451da engine: More robust refresh loop.
- Random heartbeat (between 30 and 60 seconds).
- Requires 3 failures before marking a node as dead.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-06 19:39:39 -07:00
Victor Vieux
94d2375919 Merge pull request #1258 from abronan/change_replication_ttl_flag
Replace --leaderTTL flag by --replication-ttl
2015-10-06 14:09:15 -07:00
Victor Vieux
15fbd17b7e Merge pull request #1260 from abronan/update_libkv_godeps
Update libkv Godeps with migration to the new etcd client
2015-10-06 14:09:07 -07:00
Alexandre Beslic
9521a1a964 Update etcd image in integration tests to 2.2.0
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-05 09:02:37 -07:00
Alexandre Beslic
1c0d40365b Update libkv godeps with migration to the new etcd client
As 'go-etcd' was deprecated not long ago, this commit vendors
the latest changes to 'libkv', including support for the new
'coreos/etcd/client'.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-05 08:59:32 -07:00
Andrea Luzzardi
581704dd11 Merge pull request #1248 from dnephin/fix_label_ignored_by_ps
Support filtering images by labels
2015-10-02 13:49:19 -07:00
Daniel Nephin
8abf7d32e9 Support filtering images by labels
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 15:45:52 -04:00
Victor Vieux
a315803cf9 Merge pull request #1253 from raoofm/master
doc: spell check swarm in discovery readme
2015-10-02 11:47:02 -07:00
Raoof Mohammed
52a184c1db doc: spell check swarm in discovery readme
Signed-off-by: Raoof Mohammed <raoof.md@gmail.com>
2015-10-02 13:29:25 -04:00
Alexandre Beslic
c74cf900ef Replace --leaderTTL flag by --replication-ttl
Fixes #1256

Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-02 08:42:14 -07:00
Daniel Nephin
5afc1e4924 Update samalba/dockerclient dependency.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-01 15:49:29 -04:00
Andrea Luzzardi
ddf4d50bb6 Merge pull request #1251 from abronan/fix_etcd_lock_ttl
Fix etcd lock TTL refresh value in seconds
2015-09-30 18:30:41 -07:00
Alexandre Beslic
1f6b82dffb Merge pull request #1250 from dnephin/use_smaller_zk_image
Use smaller zk image for integration tests
2015-09-30 16:53:37 -07:00
Daniel Nephin
a869995eb5 Use smaller zk image.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-30 17:14:39 -04:00
Alexandre Beslic
5f1b5e5e3f fix etcd lock ttl refresh value in seconds
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-30 09:11:01 -07:00
Xian Chaobo
67bfdd67a6 Merge pull request #1236 from abronan/test_leader_failure
Add integration test for leader election in the event of a backend store failure
2015-09-30 09:16:39 +08:00
Alexandre Beslic
4c02659078 Merge pull request #1247 from vieux/mesos_dockerfiles
test against mesos 0.24.1
2015-09-29 16:09:03 -07:00
Victor Vieux
9e6d8eeda0 add mesos 0.22.1 and 0.23 dockerfiles
add mesos 0.24.0 and 0.24.1 dockerfiles
use mesos 0.24.1 in tests

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-29 15:54:22 -07:00
Alexandre Beslic
44b15a54bb Merge pull request #1246 from vieux/use_zookeeper_tag
use zookeeper 3.4.6 in the tests
2015-09-29 14:58:48 -07:00
Victor Vieux
be87111634 use zookeeper 3.4.6 in the tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-29 14:41:56 -07:00
Victor Vieux
966dcc7c39 Merge pull request #1240 from abronan/fix_zookeeper_regression
Fix zookeeper regression and CI issues on Node removal
2015-09-29 14:29:02 -07:00
Victor Vieux
e52e14b499 Merge pull request #1242 from klaus1982/master
correct mesos parameters
2015-09-29 14:26:20 -07:00
Klaus Ma
63e86289cf correct mesos parameters
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
2015-09-29 13:56:41 +08:00
Victor Vieux
d17264f409 Merge pull request #1235 from dnephin/improve_mesos_addr_error_message
Improve the mesos.addr error message
2015-09-25 15:52:59 -07:00
Alexandre Beslic
988a3acb6b increase node removal check retry time in zookeeper integration tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-25 08:00:04 -07:00
Alexandre Beslic
e17a89b384 update libkv, fix regression with zookeeper missing entries
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-25 07:57:43 -07:00
Daniel Nephin
605e528274 Improve the mesos addr error message
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-24 19:43:02 -04:00
Victor Vieux
8ac69722b1 Merge pull request #1228 from abronan/leader_election_lock_ttl
Add the support for specifying Leader Election TTL
2015-09-24 11:46:50 -07:00
Alexandre Beslic
ca20e4ca00 add integration test for leader election in the case of store failure
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-24 09:43:13 -07:00
Alexandre Beslic
a69c022e5e Merge pull request #1231 from vieux/update_compose_in_tests
update compose in tests
2015-09-23 13:23:19 -07:00
Victor Vieux
829db076c3 update compose in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-23 12:06:32 -07:00
Alexandre Beslic
a792519978 Merge pull request #1208 from vieux/volume_create_delete
docker volume create & docker volume delete
2015-09-23 10:45:44 -07:00
Alexandre Beslic
ab8d1b489c add support for specifying the leader election lock ttl
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-23 04:06:35 -07:00
Alexandre Beslic
a583e9929e Merge pull request #1229 from vieux/test_images
fix test images
2015-09-22 17:58:44 -07:00
Xian Chaobo
063f5dbab4 Merge pull request #1204 from MHBauer/events-until
implement `--until` flag for swarm api
2015-09-22 09:13:02 +08:00
Victor Vieux
53357d88fd Merge pull request #1213 from jimmyxian/fix-import-load-return-code
Fix import/load return code
2015-09-21 17:13:07 -07:00
Victor Vieux
fdeb8d88ef fix test images, busybox is only one layer now
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-19 07:07:16 -07:00
Victor Vieux
76591d20c1 Merge pull request #1219 from jimmyxian/fix-connect-event
Fix connect event
2015-09-18 23:07:04 -07:00
Morgan Bauer
b1d3b625de implement --until flag for swarm api
- mostly copied the idea from base docker
 - refactored the locking in event handling
 - integration test for until flag

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-18 14:20:30 -07:00
Victor Vieux
ce7c0a6dfa Merge pull request #1223 from vieux/fix_race_tests
fix race in tests
2015-09-18 14:18:20 -07:00
Victor Vieux
79d1ee4861 add volume create
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:23:22 -07:00
Victor Vieux
440a379860 docker volume rm
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:22:57 -07:00
Victor Vieux
068a587f17 fix issue with last docker
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:06:14 -07:00
Xian Chaobo
8fa6420e11 add integration test for connect/disconnect events
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-18 05:13:52 -04:00
Victor Vieux
02bd0e9b76 Merge pull request #1202 from abronan/update_libkv
Update libkv Godeps
2015-09-17 22:58:22 -07:00
Victor Vieux
88ff2baa96 fix race in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-17 15:26:10 -07:00
Alexandre Beslic
1cb265d0b6 update libkv Godeps
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-17 07:52:00 -07:00