Commit Graph

227 Commits

Author SHA1 Message Date
Isabel Jimenez
d86ab642fb adding implementation for TotalMemory and TotalCpus
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-06-15 21:05:27 -04:00
Andrea Luzzardi
82fc920e90 Engine: fix panic in disconnect with events.
Replaces #937

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Victor Vieux
53e88f3712 Merge pull request #933 from vieux/support_1.6.x+
Support 1.6.0+
2015-06-12 15:58:52 -07:00
Victor Vieux
1afc1be2d1 support only 1.6.0+
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 13:27:15 -07:00
Victor Vieux
bc418df194 Merge pull request #936 from vieux/getting_started_mesos
add very simple getting started for mesos
2015-06-12 13:07:11 -07:00
Victor Vieux
3f0c3bc1c7 add getting started mesos
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 11:49:41 -07:00
Victor Vieux
4f688db989 disconnect on duplicate
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-11 15:09:37 -07:00
Victor Vieux
c44151ff4a pretty print mesos offers
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-09 17:30:14 -07:00
Victor Vieux
12dac7560a fix lock in cluster.go
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-09 12:18:38 -07:00
Victor Vieux
3a1df50ed5 improve locks in queue.go
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-09 11:43:21 -07:00
Andrea Luzzardi
47dbb5a30d Merge pull request #902 from vieux/improve_docker_info
Improve docker info against 1.7
2015-06-05 15:52:13 -07:00
Marco Mancini
9e27ae9140 Fix reserved cpus computation
Added test as Vieux suggested/Fixed CpuShare computation

Signed-off-by: Marco Mancini <marcomancini72@gmail.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:59:15 -07:00
Victor Vieux
c1020da636 nits
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux
4f9c9f5867 use dockerclient structs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux
2bf6c1a529 improve docker infi with 1.7
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux
15a8b73ab6 fix cpus
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 17:26:32 -07:00
Victor Vieux
4212b69c96 use inspect sent by mesos 0.23
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 14:42:37 -07:00
Victor Vieux
e8445ed8ce fix panic is disconnect
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 11:27:17 -07:00
Victor Vieux
83f97f73e8 Merge pull request #886 from vieux/add_resources_test
fix resources in docker 1.7
2015-06-02 16:15:12 -07:00
Victor Vieux
7604d1cc30 add test
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-02 16:03:37 -07:00
Victor Vieux
e8e9d553a2 handle compat
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-02 15:39:12 -07:00
Andrea Luzzardi
e0188d8b66 Merge pull request #873 from jimmyxian/add-load-unit-test
Add load unit test
2015-06-01 15:43:08 -07:00
Andrea Luzzardi
0e32d052cf Merge pull request #878 from chanwit/private-reg-tag
fix matching image name with private repo
2015-06-01 15:35:45 -07:00
Chanwit Kaewkasi
7725b572c2 refactor parsing to a function
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-06-01 00:43:52 +07:00
Chanwit Kaewkasi
2701342a0c fix matching image name with private repo
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-05-31 21:01:00 +07:00
Xian Chaobo
78957d527b add load unit test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-29 22:44:27 -04:00
Xian Chaobo
def00ea0a0 fix load
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-29 22:35:27 -04:00
Victor Vieux
ec784bd100 add initial version of mesos/cluster_test.go
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-29 15:07:04 -07:00
Xian Chaobo
684b2802d7 add import in mesos
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-27 22:12:56 +08:00
Xian Chaobo
d7001cac97 fix import unit test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-27 22:11:05 +08:00
Xian
8da3de3cc4 add import unit test
Signed-off-by: Xian <xianchaobo@huawei.com>
2015-05-27 22:11:05 +08:00
Xian Chaobo
1f20358b5d add support import
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-27 22:11:03 +08:00
Victor Vieux
284ba144ed remove deadlock in mesos
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 19:34:54 -07:00
Andrea Luzzardi
0fb33f61d5 update testify
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 19:01:09 -07:00
Isabel Jimenez
db7d918c0a Addressing review comments
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-26 19:45:10 -04:00
Victor Vieux
300932b2d5 add slave_test.go, add tast_test.go
add basic network mode support

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Timothy Chen <tnachen@gmail.com>
2015-05-26 16:22:34 -04:00
Isabel Jimenez
19c14fde2e Adding integration tests, decline offers after 'SWARM_MESOS_OFFER_TIMEOUT', Tracking tasks and managing offers, refactoring list of slaves, queue create requests before processing them
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-05-26 16:21:54 -04:00
Timothy Chen
20a5a7e588 Support port and address for Mesos.
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-26 16:19:08 -04:00
Isabel Jimenez
18235bee97 cluster mesos with engine
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-05-26 16:18:33 -04:00
Victor Vieux
9db6bce98b Merge pull request #823 from vieux/containers
create containers.go
2015-05-26 13:05:26 -07:00
Victor Vieux
b5094bde55 create Containers type
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 12:01:48 -07:00
Victor Vieux
0b24992d7c Merge pull request #815 from jimmyxian/rmi_by_name
Fix image match
2015-05-26 10:43:59 -07:00
Andrea Luzzardi
b4efc08dfc api: Integrate leader election.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 21:23:34 -07:00
Andrea Luzzardi
a3950e7f65 Merge pull request #796 from jimmyxian/refresh-container
Add Refresh container
2015-05-21 18:30:47 -07:00
Victor Vieux
f7a49591a0 add getter/setter for namespaced labels
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-21 16:21:50 -07:00
Victor Vieux
b3222a8f11 rename Destroy ro RemoveContainer for consistency
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-20 12:53:02 -07:00
Xian Chaobo
e6ce59794e merge two image match func
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 21:39:10 -04:00
Alexandre Beslic
4537b9f2ba Remove unused code
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:57:43 -07:00
Alexandre Beslic
f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00
Alexandre Beslic
d5915b2a09 Merge pull request #811 from aluzzardi/node-removal
Handle Node Removal from Discovery correctly
2015-05-19 10:11:10 -07:00