Commit Graph

2114 Commits

Author SHA1 Message Date
Andrea Luzzardi b2b32d979d scheduler now returns the list of ranked nodes rather than the top node.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 15:32:37 -07:00
Victor Vieux 267d7e6701 Merge pull request #1261 from aluzzardi/parallel-scheduling
Parallel scheduling
2015-10-09 12:57:42 -07:00
Andrea Luzzardi 7c0539c650 cluster: Fix name setting of pending containers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:57 -07:00
Andrea Luzzardi 24394612f5 cluster: Don't lock the scheduler when removing a container.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:56 -07:00
Andrea Luzzardi 91279c8256 cluster: Check name uniqueness among pending containers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:56 -07:00
Andrea Luzzardi c64ae5168a Parallel scheduling support for Swarm driver.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:53 -07:00
Victor Vieux 3a79038d48 Merge pull request #1268 from aluzzardi/refresh-loop-cleanup
engine cleanup: Don't mess with the global random.
2015-10-09 12:52:39 -07:00
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
moxiegirl 96e0966afc Merge pull request #1274 from pwnall/patch-2
Document CpuShares special handling in Swarm
2015-10-09 06:11:14 -07:00
Alexandre Beslic 5f807caef1 Merge pull request #1252 from vieux/fix_detach_exec
fix exec -d
2015-10-08 18:32:07 -07:00
Victor Vieux bea2538cb5 Merge pull request #1275 from vieux/fix_volume_tests
fix volume tests with the last docker engine
2015-10-08 18:14:46 -07:00
Victor Vieux 793461daff fix volume tests with the last docker engine
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 18:14:32 -07:00
Victor Vieux b863c728d2 Merge pull request #1270 from jimmyxian/fix-soft-filter
Fix soft filter
2015-10-08 16:20:32 -07:00
Victor Costan aaf52189dc Document CpuShares special handling in Swarm
The difference is currently only documented in the issue below.
https://github.com/docker/swarm/issues/475

The diff in the PR below highlights the special handling of CpuShares.
https://github.com/docker/swarm/pull/904/files

Signed-off-by: Victor Costan <costan@gmail.com>
2015-10-08 19:05:06 -04:00
Xian Chaobo c6fb10cec3 fix soft filter
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-08 05:16:19 -04:00
Victor Vieux 03714f66d1 Merge pull request #1266 from vieux/fix_container_matching
Fix container matching
2015-10-07 17:47:25 -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 f5925f5a1c Fix container matching
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-07 14:18:35 -07:00
Andrea Luzzardi 394ae84a49 node: Use cluster.Containers instead of duplicating code
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-07 13:08:19 -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
Victor Vieux 26785556fa fix exec -d
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-01 07:29:38 -07: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