Commit Graph

475 Commits

Author SHA1 Message Date
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
Victor Vieux 64b9c50b69 use same HTTP client as dockerengine
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:03:38 -08:00
Victor Vieux cd3b1d5bd1 improve addNetwork
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 11:00:15 -08:00
Victor Vieux 3747ec9b9f change refresh logic with new events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-10 00:48:31 -08:00
Victor Vieux 208ce7d414 fix 2 typos
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-09 22:50:29 -08:00
Victor Vieux 5492f4ab82 remove refresh networks
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-09 20:14:58 -08:00
Victor Vieux f7f7f7a99b fix missing event on rescheduling
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-09 14:57:20 -08:00
Aaron Bell 6ab88246cf fix bullet list in last paragraph
Signed-off-by: Aaron Bell <aaron.bell@gmail.com>
2016-02-03 16:29:20 -08:00
Isabel Jimenez da1e5bcb24 Adding Known issues and Fucntionality to README
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-02-03 16:44:34 -05:00
Victor Vieux 24fe2c04e5 support docker network ls --filter type=XXX
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 15:57:53 -08:00
Dong Chen 388b8fd50f Only record connection failure error in error message.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-01 22:30:36 -08:00
Dong Chen 3a99c4ca85 Ignore 404 error. Remove trailing white spaces from error, including new lines.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-01 20:44:36 -08:00
Victor Vieux 1be46e7e58 retry monitor events on EOF
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 09:32:29 -08:00
Isabel Jimenez 8ddb324a9e Merge pull request #1633 from ezrasilvera/mesosCreateNW
New network functions for mesos cluster: CreateNetwork(), RemoveNetwork(), and Networks()
2016-02-01 15:17:19 -08:00
Dongluo Chen 142197258b Merge pull request #1724 from nishanttotla/1689-UnknownPendingNodes
Adding default name (unknown) for pending engine
2016-02-01 13:38:26 -08:00
Victor Vieux 36e1fbdd77 Merge pull request #1715 from vieux/1676-fiximageaffinity
Fix images affinity for local registry and digest
2016-02-01 13:01:29 -08:00
Nishant Totla 16de94b9b1 Adding default name (unknown) for pending engine
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-01 12:54:37 -08:00
Victor Vieux 336a4ff9ae Merge pull request #1721 from nishanttotla/1625-RemoveInfoBackspaces
Removing backspaces in /info output for new API version
2016-02-01 09:30:51 -08:00
Alexandre Beslic d9c677f50b Merge pull request #1697 from jimenez/double_start
Fix double start with Mesos
2016-02-01 09:08:20 -08:00
Ezra Silvera 8232a897c6 Implement network functions for mesos cluster: CreateNetwork(),
RemoveNetwork(), and Networks()

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

Adding error messages

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

fix formatting

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

fix formatting

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2016-02-01 08:12:06 -05:00