Commit Graph

631 Commits

Author SHA1 Message Date
Dong Chen 3982f039a2 Add healthcheck info to CLI.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-19 18:33:43 -07:00
Dongluo Chen ef0aa2aeb2 Merge pull request #2423 from nishanttotla/engine-api-update-interface
Updating engine-api to latest, with a new client interface
2016-07-19 18:31:07 -07:00
Nishant Totla 62b0b29aa6
Adding new client interface in Swarm
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-19 16:56:09 -07:00
Alexandre Beslic 584c6bee65 Merge pull request #2400 from xianlubird/bug/refresh-network
Remove refresh network when creating container
2016-07-19 13:24:18 -07:00
allencloud c8e39ae954 refresh single volume when event emitted
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-13 12:05:07 +08:00
Dongluo Chen 165868e33a Merge pull request #2331 from allencloud/update-min-engine-version-swarm-supports
update min docker engine's version swarm supports
2016-07-12 17:37:51 -07:00
Ezra Silvera 3baf3e68e9 Fix double RLock in Mesos cluster
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

format

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2016-07-12 12:17:46 -04:00
Ezra Silvera 265c55023c Check in pending tasks as well
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2016-07-12 10:55:00 -04:00
Ezra Silvera eac4981da8 check unique container name
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2016-07-12 10:55:00 -04:00
allencloud 0b544c93f7 update min docker engine's version swarm supports
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-12 09:51:39 +08:00
Dongluo Chen 5a6da69f6c Merge pull request #2163 from xianlubird/feature/rescheduler
fix issue #2162 add removeDuplicateContainers behaviour for every node when it's added.
2016-07-11 16:58:30 -07:00
xianlubird d1694cbab0 fix issue #2162 add removeDuplicateContainers behaviour for every node when it's added.
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-07-07 13:22:10 +08:00
allencloud 7b7937cef1 consider system's difference between swarm and engine
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-07 13:02:28 +08:00
xianlubird e361f64180 Remove refresh network when creating container
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-07-07 11:48:38 +08:00
Sun Hongliang c1100ab3a2 change the way of producing engine label
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-07 11:30:02 +08:00
allencloud baa3ca60d8 remove unnecessary err check and make some check better
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-05 11:06:57 +08:00
allencloud 3f2946107d in network event, just refresh the single network to improve performance
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-01 11:00:54 +08:00
allencloud d382fbd883 support daemon events for swarm
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-29 10:01:13 +08:00
Xian Chaobo a34785e489 Merge pull request #2303 from xianlubird/bug/concurrent_network
Fix network Uniq method concurrent map writes problem
2016-06-20 19:03:58 +08:00
NanXiao a897e53dcc Fix typo in cluster/swarm/cluster.go
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-17 19:40:55 +08:00
Doron Podoleanu 6d5638b95b Create in engine.go renamed to CreateContainer (#2283)
* Create in engine.go renamed to CreateContainer

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-06-15 16:56:03 -07:00
Dongluo Chen b3205ca161 Merge pull request #2288 from nishanttotla/refactoring-img-handling
Refactoring code around image ref generation
2016-06-14 14:34:20 -07:00
NanXiao 5f0e652d29 Edited cluster/cluster.go
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-13 17:47:09 +08:00
Xian Chaobo 453d71753e Merge pull request #2144 from allencloud/show-container-status-of-node-in-docker-info
show container status of each node in docker info
2016-06-06 10:32:27 -05:00
Allen Sun d9abab6ca9 Merge pull request #2261 from allencloud/remove-engine-in-volume-create-response
remove engine details in POST /volumes/create API
2016-06-04 11:48:14 +08:00
Dongluo Chen 416a781b64 Merge pull request #2281 from xianlubird/feature/scheduler_log
Add scheduler detail log for node
2016-06-03 10:41:37 -07:00
allencloud f62cd8c9aa fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 17:00:22 +08:00
xianlubird 61f3441d07 Add scheduler detail log for node info
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-06-02 09:27:55 +08:00
xianlubird c4886bd006 Fix network uniq method concurrent map writes problem
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-05-31 11:10:45 +08:00
allencloud d7241f3682 remove engine details in POST /volumes/create API
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-29 15:12:14 +08:00
Alexandre Beslic 13c9e87a9f Merge pull request #2262 from allencloud/remove-refreshVolumes-not-used
remove unused refreshVolumes in cluster.go
2016-05-27 14:10:41 -07:00
Nishant Totla e782541d99
Refactoring code around image ref generation
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-26 10:37:39 -07:00
Nishant Totla 89277806cb
Fixing RegistryAuth for image pulls
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 17:48:14 -07:00
Nishant Totla 46ba8763be
Updating unit tests for updated engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 16:53:02 -07:00
Nishant Totla 82f1bfe0ec
Changing relevant function calls for updated engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 15:47:06 -07:00
allencloud 7d5ef9016d remove not used refreshVolumes in cluster.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-23 00:35:37 +08:00
fugr ae824704e5 fix missing handle 'update' event massage.
Signed-off-by: fugr <fugr2012@gmail.com>
2016-05-14 19:13:56 +08:00
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