Commit Graph

130 Commits

Author SHA1 Message Date
Sriram Natarajan 9f29e95abc Add Node Labels to Cluster Info information
Updates: docker info output and /info API
Check for labels in API integration tests

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-21 20:30:19 +00:00
Xian Chaobo 5c068de28c add force-refresh when commit/tag/pull
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-20 02:45:06 -04:00
Andrea Luzzardi 9ac7dd2402 Merge pull request #603 from vieux/add_build
Proposal: Add build support on a random node
2015-04-16 16:21:38 -07:00
Victor Vieux 05b01c7b43 forcerefresh after build and add test
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-16 12:22:09 -07:00
Andrea Luzzardi 4db132e20e Merge pull request #594 from noxiouz/add_rlocks_to_swarm_cluster
Add Rlocks to swarm cluster
2015-04-16 12:20:58 -07:00
Victor Vieux d74e872952 add build
improve random selection

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-16 12:19:09 -07:00
Victor Vieux 8506acbed2 fix proxyRandom even without container
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-16 12:17:38 -07:00
Andrea Luzzardi 442217d6dc Cleanup events handler.
- Renamed Events() to RegisterEventHandler() in Engine.
- Added RegisterEventHandler() to the Cluster interface.
- Removed EventHandler requirement from swarm's Cluster constructor.
- Make API's events handler private.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 15:59:55 -07:00
Sriram Natarajan 49f644934c Improve Error message to show node's Name and IP
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-14 11:27:02 -07:00
Sriram Natarajan b174aa26de Change heartbeat type to unsigned int
Check if heartbeat value is greater than zero

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-09 00:04:50 +00:00
Anton Tiurin 2b4bbf1ef2 [SwarmCluster] Add RLock to Cluster.Pull
Use sync.WaitGroup (go-way) to wait for a collection
of pulling goroutines.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 22:30:23 +03:00
Anton Tiurin b221baf4ed [SwarmCluster] Add RLock to Cluster.hasEngine
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 22:25:54 +03:00
Anton Tiurin e66abdf7bb [SwarmCluster] Remove an extra RLock in Engine.Container
Engine.Container uses an array of containers from Engine.Containers, which is
built under an internal RLock, so the external RLock is useless.
Also allocate enough memory for the array of containers (images).

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 00:41:28 +03:00
Victor Vieux 853aaf6027 nodes -> engines
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 11:46:33 -07:00
Victor Vieux 0c1782c7c0 fix proxyRandom and cleanup node -> engine
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:38:10 -07:00
Victor Vieux 1297a4cef2 transform node interface to engine struct
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:19:37 -07:00
Alexandre Beslic 88b69e0671 Merge pull request #573 from aluzzardi/container-update-fix
Fix container update flow.
2015-04-03 17:03:14 -07:00
Victor Vieux 820527be7e Sort docker info by name
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:37:27 -07:00
Andrea Luzzardi 23d52249fa Fix container update flow.
This guarantees that containers get fully updated before being inserted
in the node (and returned by .Containers()).

Fixes #560

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-03 16:21:48 -07:00
Victor Vieux 20ec7a889e add strategy and filters to docker info
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 15:56:26 -07:00
Victor Vieux c41d73dd50 add error message
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-03 01:28:08 +00:00
Victor Vieux 58b282a4a3 Merge pull request #545 from aluzzardi/synchronous-creater-destroy
Make container creation and destruction synchronous.
2015-04-01 15:41:26 -07:00
Victor Vieux b304a453f4 use 1024 as total cpushare for a machine
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-01 11:49:00 -07:00
Andrea Luzzardi ca05173e41 Make container creation and destruction synchronous.
This is in order to fix race conditions. Currently, container creation
can happen in parallel which means that the scheduler operates on stale
data.

Fixes #427

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-31 14:11:51 -07:00
Matt Bajor d87c48ae4e Fix lint violations
This changeset fixes all lint violations that show up with a
min_confidence of 1

- Issue #500: Run golint on codebase

Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
2015-03-27 21:17:44 -06:00
Alexandre Beslic 904c720ea5 Merge pull request #446 from vieux/rmi
add docker rmi
2015-03-24 16:04:35 -07:00
Victor Vieux 64d01b4e4a add fixme
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-19 10:02:33 -07:00
Victor Vieux e6b3b04150 do not leak dockerclient
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-18 13:48:09 -07:00
Victor Vieux c969fcdae6 use dockerclient
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux b4a88ad622 Add match in images.go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux 649b6cf577 add docker rmi
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux 8c09bba1de mitigate race in pull while we wait for a proper store
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 23:29:42 +00:00
Victor Vieux b9e600d38d pull only latest if no tag
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-17 16:19:35 -07:00
Victor Vieux de62579f8d handle errors in pull
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-11 14:34:47 -07:00
Victor Vieux 0fca58b069 add Node back to inspect
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-06 16:40:55 -08:00
Victor Vieux 0e7f970d4d use a single callback
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-06 11:22:14 -08:00
Victor Vieux e0fa132ec9 add parallel
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 17:09:08 -08:00
Victor Vieux 7ad8a3705f add support for pull and rmi
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 17:09:08 -08:00
Victor Vieux eccaf6e5eb Cleanup: Make swarm Node and Cluster functions private
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 11:53:40 -08:00
Victor Vieux 0569f7d4dd swarm.Node -> swarm.node && some method now private
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-02 18:02:31 -08:00
Victor Vieux 92ab1e347c cleanup swarm scheduler code
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-02 17:55:06 -08:00
Victor Vieux 8b7afe2c73 remove mesos.go to move it to it's own PR
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux a8885ab997 removed nodes.go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux d8042f9677 add Node interface
Usable -> Total & Reserved -> Used

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux 4bfeb4b640 move list of node to swarm only
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux 47e03120f5 remove Nodes(), add Images() and Images()
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux fa8a06685b remove events from the cluster interface
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux 6348fdd849 move discovery out of the cluster interface
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux ce98e66c63 cluster API instead of scheduler API
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux 126f550317 add SchedulerOptions
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00