Commit Graph

594 Commits

Author SHA1 Message Date
Dongluo Chen 45d2960226 Merge pull request #2184 from realityone/fix-reschedule-docs
fix set reschedule policy docs
2016-05-11 14:02:04 -07:00
realityone fb28924a69
fix set reschedule policy docs
Signed-off-by: realityone <realityone@me.com>
2016-05-10 13:15:36 +08:00
Sun Hongliang b1f42fb8cc hide error in info when empty
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-08 15:32:19 +08:00
Sun Hongliang a28e2e7e30 fix typos in swarm/cluster.go
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-06 11:16:37 +08:00
Dong Chen d6e6703e29 Prevent double RLock() of RWMutex. It may lead to deadlock if there is Lock() call from another goroutine in between.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-05-05 10:45:34 -07:00
Sun Hongliang 8a5531777b show container status of each node in docker info
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-04 17:23:45 +08:00
Nishant Totla b69728a2c5 Merge pull request #2196 from allencloud/fix-typos
fix typos in test and other files
2016-05-01 16:54:33 -07:00
Sun Hongliang 6cd8a06c8f fix typos in test and other files
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-02 07:29:33 +08:00
Sun Hongliang eafd9d658d use engine-api to replace dockerclient
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-01 00:14:00 +08:00
Alexandre Beslic dd90e08024 Merge pull request #2176 from allencloud/close-http-response-body-to-avoid-memory-leak
close http response body to avoid potential memory leak
2016-04-28 18:23:25 -07:00
Victor Vieux c07a84529d Merge pull request #2175 from nishanttotla/remove-type-conversions
Remove type unnecessary type conversion
2016-04-27 18:09:51 -07:00
Dongluo Chen 797bdd5775 Merge pull request #2169 from allencloud/add-NodeID-in-docker-info
add NodeID in docker info
2016-04-27 13:08:12 -07:00
Sun Hongliang b5a74ee875 close http response body to avoid potential memory leak
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 12:14:36 +08:00
Sun Hongliang 8cca29e9a9 add NodeID in docker info
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 08:30:30 +08:00
Nishant Totla c70f836e88
Remove type unnecessary type conversion
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-26 13:42:17 -07:00
Nishant Totla 6998163ab1
Change context.TODO() to context.Background()
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-25 13:59:21 -07:00
Dongluo Chen bf9e985d5b Merge pull request #2132 from nishanttotla/image-ops-engine-api
Moving last few image operations to engine-api
2016-04-22 22:05:02 -07:00
Victor Vieux b352839605
@abronan's typo
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-22 14:17:32 -07:00
Nishant Totla 4d56ba5190
Moving last few image operations to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-22 13:47:51 -07:00
Victor Vieux 622b509274 use engine-api for events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 18:11:40 -07:00
Dongluo Chen a91c6e0159 Merge pull request #2128 from nishanttotla/container-ops-engine-api
Move container rename and remove to engine-api
2016-04-14 17:31:09 -07:00
Nishant Totla 3680a717a1
Move container rename and remove to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 16:00:36 -07:00
Nishant Totla 524f5ca79c
Moving start container to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 15:08:39 -07:00
Nishant Totla 8d99298648
Fix deprecated config for engine < 1.7, image pull waits for end of
response

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:01 -07:00
Nishant Totla af5ce4bdb0
Returning error when Image Pull fails
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:01 -07:00
Nishant Totla 40456d0926
Updating unit tests
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:01 -07:00
Nishant Totla f5e578188f
Updating ContainerConfig to embed HostConfig and NetworkingConfig
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:00 -07:00
Nishant Totla ff0c79e08d
Fix image pull bug (wait until download finishes)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:00 -07:00
Nishant Totla 2363ea8077
Updating Godeps (distribution/reference)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:00 -07:00
Nishant Totla 25241bdd08
Updating Image Pull to use docker/distribution package
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:00 -07:00
Nishant Totla 0b75203143
Update container state (from PR samalba/dockerclient#/236)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:00 -07:00
Nishant Totla 6d2937b3ec
Updating cluster unit tests
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 11df80601c
Updating cluster
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 81e1528d0f
Updating API handlers
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 79575f3df6
Updating ContainerConfig to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 1dee9cb3f0 Returning and handling error from HTTPClientAndScheme
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-08 13:36:06 -07:00
Victor Vieux 69eabdc81f fix possible data race with failure count
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-07 13:35:27 -07:00
Sun Hongliang d403254ed2 1.validate cluster option swarm.overcommit
2.change swarm.createretry's error info and add its integration test
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-07 09:00:41 +08:00
Victor Vieux ee30452059 Merge pull request #2080 from allencloud/log-warn-when-getting-engine-label-named-node
send warn message if got an engine with label "node"
2016-04-06 17:20:09 -07:00
Sun Hongliang b6f646cacd log err when remove container fails in rescheduling
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-06 14:23:09 +08:00
Nishant Totla 012dffeee3 Updating apiClient version using server version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-05 11:25:17 -07:00
Sun Hongliang 65a5d54727 send warn message if got an engine with label "node"
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-05 11:33:43 +08:00
Victor Vieux 5e13bcf8ff use engine-api for network create
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-25 15:35:04 -07:00
Victor Vieux 2906a670a3 Merge pull request #2060 from allencloud/fix-typos
fix typos
2016-03-31 15:50:05 -07:00
Sun Hongliang 07a47d54a4 fix typos
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-31 13:52:01 +08:00
Nishant Totla 8a003a5fa8 Reusing ImageListOptions for ImageFilterOptions
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 11:00:05 -07:00
Nishant Totla ebdbefecda Updating image related unit tests to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 10:15:35 -07:00
Nishant Totla 7de9f6ee62 Moving over images to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 09:46:38 -07:00
Morgan Bauer 4516d1ae16
use apiClient for volumes management
- create volume
 - list volumes

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 15:01:27 -07:00
Morgan Bauer 0be5b31f27
use apiClient for listing networks in refresh
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer 08a475d661
use apiClient for removing volumes
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer cac3943680
use apiClient for removing networks
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer 1e22226b71
use apiClient for removing images
- remove unused argument
 - unit test of new client

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Victor Vieux 3461df4032 Merge pull request #2042 from vieux/update_build
support private images, labels and other new flags in docker build
2016-03-28 22:50:28 -07:00
Nishant Totla 0ebb26bdd4 Printing engine version in Info
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-28 17:40:50 -07:00
Nishant Totla 4db4e951c7 Merge pull request #2031 from allencloud/fix-minor-typo
fix minor typo
2016-03-27 18:36:32 -07:00
Sun Hongliang da7128cc16 fix minor typo
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-26 10:33:11 +08:00
Sun Hongliang ec0c3f7bbd output error when starting a rescheduled container fails.
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-25 19:28:46 +08:00
Victor Vieux e98cf00409 support private images, labels and other new flags in docker build
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 18:27:20 -07:00
Dongluo Chen 69c44967be Merge pull request #2017 from allencloud/fix-typos-in-mesos
fix typos in /swarm/cluster/mesos/cluster.go
2016-03-24 10:12:11 -07:00
Xian Chaobo dcf2608798 Merge pull request #1992 from dongluochen/AddNodeSpecUpdate
Periodically update node spec
2016-03-24 20:36:32 +08:00
Sun Hongliang 3843dbb381 fix typos in /swarm/cluster/mesos/cluster.go
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-24 10:49:28 +08:00
Dong Chen 0436dd1f26 An endpoint is duplicate/stale if its ID is part of endpoint index.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 14:10:57 -07:00
Dong Chen d045bd44e0 Skip redundant endpoints in "network inspect"
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 10:19:22 -07:00
Nishant Totla 1e821e48ed Plumbing context through all calls to engine-api client
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-18 14:55:05 -07:00
Dong Chen 040f63cd47 Force node spec update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-18 10:23:39 -07:00
Victor Vieux 9de8f77d55 Merge pull request #1986 from allencloud/move-experiemental-about-rescheduling-out-of-config
move more details about rescheduling out of experimental
2016-03-17 11:00:56 -07:00
Sun Hongliang 4b04286f90 fix typos in watchdog
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-17 22:20:26 +08:00
Sun Hongliang 129f38366e move more experimental out of rescheduling
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-17 20:13:46 +08:00
Dong Chen b61dfa7497 Force inspect for containers in Restarting state.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-16 18:43:37 -07:00
Victor Vieux 0744188c9b Merge pull request #1981 from dongluochen/ContainerRestartEvent
Docker restart event should trigger container inspect
2016-03-16 17:20:18 -07:00
Dongluo Chen 85f6d57f21 Merge pull request #1972 from vieux/pass-host-config
HostConfig for /start endpoint
2016-03-16 17:19:29 -07:00
Dong Chen c35d95fac4 Docker restart would change container state. Should do a container inspect to update status.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-16 16:27:35 -07:00
Victor Vieux 968aae4f9c Merge pull request #1977 from dongluochen/RetryEventMonitor
Swarm manager should retry EventMonitoring on failure
2016-03-16 15:59:44 -07:00
Dong Chen 26931816c4 Manager should retry EventMonitoring on failure.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-16 15:35:22 -07:00
Victor Vieux 56affa1ada fix image matching via id
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-16 15:12:56 -07:00
Victor Vieux b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07:00
Sun Hongliang 172048942d fix typos.
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-14 11:21:59 +08:00
Dongluo Chen 957f81036b Merge pull request #1943 from nishanttotla/removing-dead-code
Deleting redundant code from volume.go
2016-03-11 13:44:48 -08:00
Yongqiao Wang 134df4293c Support rescind offer in swarm.
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-03-11 11:13:56 +08:00
Nishant Totla 8cbffa9492 Deleting redundant code from volume.go
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-10 14:14:28 -08:00
Nishant Totla ba31ab2d4b Merge pull request #1872 from echupriyanov/volume_info_fix
Fix get volume call for volumes with non-local drivers
2016-03-10 13:47:14 -08:00
Nishant Totla 6af37c4888 Updating info function to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-09 13:58:50 -08:00
Nishant Totla 453304c795 Updating version function to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 17:46:24 -08:00
Nishant Totla d4cfba1844 Adding engine-api client
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 15:05:43 -08:00
Dong Chen e0583ea7d7 Prevent crash on channel double close.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-07 11:48:01 -08:00
Sun Hongliang c34a45023f fix typos in a test file and a function annotation
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-05 00:39:15 +08:00
Eugene Chupriyanov 05d9995985 Proposed fix for https://github.com/docker/swarm/issues/1847
* Fix cluster.Volumes.Get() call for volumes with non-local drivers
* Added tests for clusterVolumes.Get()

Signed-off-by: Eugene Chupriyanov <tchu@tchu.ru>
2016-03-02 13:40:32 +03:00
Dong Chen 87a03b9157 Close TCP connections at disconnect.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-01 13:48:58 -08:00
Doug Davis 4dc645bb8a Add missing 'defer'
as it stands now the lock at this spot in the code is pretty useless.
All it does it block us but since we release the lock before we check
e.state its a roadblock with no real purpose.
One could argue that a lock isn't needed at all but I think having it
there for consistency with the other funcs would be good.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-02-29 13:51:10 -08:00
Yongqiao Wang ddce40187c Find some typos when browse the code, fix them in this patch.
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-02-26 20:16:39 +08:00
Sun Hongliang aa6ff494e4 Fix #1873
force to validate whether engine's label is like format "key=value"

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-02-25 12:58:25 +08:00
Victor Vieux 22fedf0db0 support docker run --net <node>/<network>
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-23 13:13:31 -08:00
Victor Vieux 854cad3c14 don't erase hostconfig on refresh
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-18 10:01:26 -08:00
Victor Vieux c42142e408 Revert "Passing HostConfig for /start endpoint"
This reverts commit 6ff0d29c9d.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:37 -08:00
Nishant Totla 6ff0d29c9d Passing HostConfig for /start endpoint
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-17 11:06:51 -08:00
Dong Chen bfc556613b Lock engine to prevent simultaneous change on `containers` map.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-12 15:34:15 -08:00
Chanwit Kaewkasi fce3620235 Merge pull request #1794 from dongluochen/refreshBackoffOnFailure
Implement engine refresh backoff strategy for failing nodes
2016-02-12 19:58:08 +07:00
Alexandre Beslic 3c044d045c Merge pull request #1777 from vieux/remove_refresh_networks
remove refresh networks from cluster to improve perfs
2016-02-11 15:47:44 -08:00
Dong Chen b03bf75557 Implement engine refresh backoff strategy for failing nodes. Use a backoff factor so the backoff speed is relative to user setting.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-11 15:37:17 -08:00