Commit Graph

592 Commits

Author SHA1 Message Date
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
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
Nishant Totla 3d7678389f Removing backspaces in /info output for new API version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-31 23:54:33 -08:00
Isabel Jimenez c809e6a643 Fix double start
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-31 19:08:48 -05:00
Victor Vieux e98456ea78 Merge pull request #1688 from Spritekin/master
Fixes swarm overloading slaves when using the mesos drivers.
2016-01-29 16:35:50 -08:00
Chanwit Kaewkasi 1fa6cd9c55 Merge pull request #1707 from vieux/improve_logs_and_lock
Improve logs and fix lock in engine
2016-01-30 04:02:50 +07:00
Victor Vieux f08f47044e Merge pull request #1706 from jimenez/rename_agent
Renaming agent in README
2016-01-29 11:42:04 -08:00
Isabel Jimenez d86226dfb3 Renaming agent in README
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-29 14:32:23 -05:00
Victor Vieux 967a98d40f fix unit test and add integration test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 13:12:42 -08:00
Victor Vieux 25b61791a5 improve rescheduling logs
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 08:25:28 -08:00
Victor Vieux 188b3fd00d change rlock to lock
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 08:25:13 -08:00
ChangHai Yan a59f3578ee use ParseRepositoryTag in image
Signed-off-by: ChangHai Yan <changhai.ych@alibaba-inc.com>
2016-01-28 19:50:09 +08:00
Victor Vieux fbab9d05ba reschedule swarm container only
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 03:17:34 -08:00
Victor Vieux f3a1027bbe update docker info
add test

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 01:07:52 -08:00
Guillermo Rodriguez b830f9f269 Fixes swarm overloading slaves when using the mesos drivers.
The problem is described here:
https://github.com/docker/swarm/issues/1588

This fix also allows reducing the offer timeout which reduces problems with mesos resource consolidation described here:
https://github.com/docker/swarm/issues/1655

Signed-off-by: Guillermo Rodriguez <grodriguez@cmcrc.com>
2016-01-27 12:25:45 +11:00
Victor Vieux 4194778242 fix network filter with global network
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-26 11:03:26 -08:00
Dong Chen abffebf09e Provide error when engine version is unsupported.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-25 15:58:48 -08:00
Victor Vieux 7c41b95b8e Merge pull request #1672 from jimenez/mesos0.26
Upgrading Mesos integration tests to 0.26.0
2016-01-22 17:03:38 -08:00
Isabel Jimenez b290a62342 Adding mesos 0.26 Dockerfile for tests
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-22 17:56:48 -05:00
Dong Chen 46a33f70ff Use exponential backoff strategy to validate pending engine.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-21 14:02:34 -08:00
Dong Chen 14bfc52d36 Enforce minimum backoff to avoid simultaneous validation on one engine.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-20 17:49:40 -08:00
Dong Chen 39dc28a4df Fix a race condition in pending engine validation, discard parallel validation result.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-19 16:19:09 -08:00
Dong Chen 180bc90b1b Mac build fix
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-18 16:54:22 -08:00
Dong Chen 15c9dbaee0 Support TCP_USER_TIMEOUT for Linux and its equivalent in Mac
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-18 15:46:27 -08:00
Victor Vieux c6de0c3dc6 update some comments
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 21:08:00 -08:00
Victor Vieux 1225eddc79 allow engine/name support in volumes
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 17:40:53 -08:00
Victor Vieux 04fb48d27a support 1.10 events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-15 19:35:04 -08:00
Isabel Jimenez a99ceeb9c1 Adding suicide logic for tasks so as to prevent false timeout for tasks having a long image pull
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 13:37:23 -05:00
Victor Vieux 08839f62fa Merge pull request #1636 from jimenez/checkpoint_failover
Enabling checkpoint failover in FrameworkInfo
2016-01-14 10:18:09 -08:00
Victor Vieux d3e4ddb0f7 Merge pull request #1635 from jimenez/task_timeout_restructure
Removing Queue package and regrouping task logic
2016-01-14 10:18:03 -08:00
Isabel Jimenez b297c1bd41 Enabling checkpoint failover in FrameworkInfo
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 04:05:00 -05:00
Isabel Jimenez fe8da8fe80 Removing Queue package and regrouping task logic
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 03:52:11 -05:00
Dong Chen 8cc9b6c284 Add swarm container create retry option.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-13 16:06:38 -08:00
Alexandre Beslic d21748699d Merge pull request #1565 from jimmyxian/fresh-image-when-commit
fresh image when receive commit event
2016-01-13 12:01:09 -08:00
Victor Vieux 985974854c Merge pull request #1630 from jimenez/driver_join
Adding observe async for driver abort/errors
2016-01-13 11:47:10 -08:00
Isabel Jimenez 9bfc28c291 Adding obeserve async for driver abort/errors
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-13 04:46:45 -05:00
Alexandre Beslic 254e095f77 Merge pull request #1601 from vieux/docker_discovery
use docker/docker/pkg/discovery and update godeps
2016-01-12 17:06:51 -08:00
Victor Vieux 18b6435839 Merge pull request #1621 from jimenez/scheduler_driver
Restructuring mesos scheduler driver outside of Cluster
2016-01-12 17:02:35 -08:00
Isabel Jimenez 443d49167a Restructuring mesos scheduler driver outside of Cluster
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-12 19:24:50 -05:00
Alexandre Beslic e1213384bc Merge pull request #1578 from aluzzardi/rescheduling
[experimental] Simple container rescheduling on node failure
2016-01-12 15:00:27 -08:00
Victor Vieux 14bf4e08b3 add -experimental to enable rescheduling
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 01:35:39 -08:00
Victor Vieux 31ad0e047f update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 00:38:09 -08:00
Victor Vieux fc1e7bbca2 use docker/docker/pkg/discovery
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 00:38:06 -08:00
Victor Vieux a2018c177c improve eventHandlers locking
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 17:23:48 -08:00
Dong Chen 8f384b1d40 Address review comments.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-11 16:08:51 -08:00
Victor Vieux 78008f4d4a add doc
fix tests and keep swarm id
remove duplicate on node reconnect
explicit failure

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 15:59:44 -08:00
Andrea Luzzardi 13f60212f5 Add support for container rescheduling on node failure.
Add rescheduling integration tests.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-01-11 15:59:44 -08:00
Andrea Luzzardi 56941d02a8 cluster: Support multiple event handlers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-01-11 15:59:44 -08:00
Dong Chen cf664141b6 Scheduler prefers nodes without connection failures.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-11 11:42:58 -08:00
Xian Chaobo 1fef59f738 fresh image when receive commit event
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-01-08 17:25:30 +08:00
Alexandre Beslic 8b173fd382 Merge pull request #1569 from dongluochen/nodeManagement
Improve node management.
2016-01-07 16:14:36 -08:00
Dong Chen 7e266f18ed Name constants.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-07 15:55:12 -08:00
Xian Chaobo 3aa302d706 Merge pull request #1587 from vieux/do_not_save_image_aff
do not save image affinity on reschedule
2016-01-07 09:42:16 +08:00
Dongluo Chen b4a6ad2e56 Merge pull request #1585 from jimenez/klaus-jimenez-offer-refuse
Klaus jimenez offer refuse
2016-01-06 13:20:02 -08:00
Isabel Jimenez 5a529d4c4a Adding help for new flag offer_refuse_seconds and renaming
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-06 15:50:30 -05:00
Dong Chen 58a0e1719d Update failureCount scenario and test cases.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-06 10:33:51 -08:00
Dong Chen 9a1584d508 Update integration test. Reduce pending node validation sleep interval. Each pending node has its own validation interval according to failure count. So reducing sleep interval is not increasing validation frequency for unreachable nodes.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-05 15:56:55 -08:00
Dong Chen 52a7616d99 Add integration test for state machine.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-05 14:59:30 -08:00
Victor Vieux 2449a352ef add unit test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-05 10:31:47 -08:00
Victor Vieux 5daaecdaa1 do not save image affinity on reschedule
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-05 10:29:45 -08:00
Klaus Ma cf78e799fd address review comments
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
2016-01-05 13:18:51 -05:00
Klaus Ma b68537cc20 correct code style & build error
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
2016-01-05 12:47:42 -05:00
Klaus Ma a23ce43337 Add MESOS_OFFER_REFUSE_SECONDS environment configuration
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
2016-01-05 12:47:42 -05:00
Victor Vieux 97f3767618 fix soft affinity reschedule
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-05 04:58:36 -08:00
Dong Chen 995866d76c Improve node management.
1. Introduce pending state. Pending nodes need validation before moving to healthy state. Resolve issues of duplicate ID and dead node drop issues.
2. Expose error and last update time in docker info.
3. Use connect success/failure to drive state transition between healthy and unhealthy.

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-30 13:25:43 -08:00
Victor Vieux a2380a6c71 update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-22 00:20:04 -08:00
Victor Vieux be0fce961f update code
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-22 00:20:04 -08:00
Isabel Jimenez de0e67f571 Merge pull request #1554 from ezrasilvera/mesosFixLock
Change the scheduler lock in Mesos cluster
2015-12-18 10:20:29 -08:00
Ezra Silvera 219f7192d6 Change the scheduler lock in Mesos cluster
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2015-12-17 18:20:57 +02:00
Dong Chen 02553d0727 Cover connection failure error reported by dockerclient and by proxy cases.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:20:29 -08:00
Dong Chen 9bc6c35321 Use engine connection error to fail engine fast.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -08:00
Dong Chen ec3b00c484 Reorganize engine failure detection procedure. Change engine option 'RefreshRetry' to 'FailureRetry'.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -08:00
Dong Chen 4d24256c19 Use failureCount as a secondary health indicator.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -08:00
Victor Vieux cdd42a5c6b display all the containers that are part of a global network on inspect
update godeps

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-12-15 17:48:35 -08:00
Victor Vieux ed987b8d85 Merge pull request #1542 from jimenez/slave_to_agent
Name changing slave to agent
2015-12-14 13:57:31 -08:00
Isabel Jimenez 18cccc521c renaming files + change on tests
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-12-14 16:20:38 -05:00
Victor Vieux 81bf5bc067 Merge pull request #1538 from vitan/patch-1
Typo
2015-12-14 13:18:26 -08:00
Isabel Jimenez 60c15834da changing slave to agent
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-12-14 14:46:56 -05:00
Zhou Weitao 72db0bbc04 Typo
Signed-off-by: Weitao Zhou <wtzhou@dataman-inc.com>
2015-12-14 09:55:10 +08:00
Daniel Hiltgen dde577d154 Add token pass-thru for Authconfig
This augments the CreateContainer call to detect the AuthConfig header
and use any supplied auth for pull operations.  This will allow pulling
of protected image on to specific node during the create operation.

CLI usage example using username/password:

    # Calculate the header
    REPO_USER=yourusername
    read -s PASSWORD
    HEADER=$(echo "{\"username\":\"${REPO_USER}\",\"password\":\"${PASSWORD}\"}"|base64 -w 0 )
    unset PASSWORD
    echo HEADER=$HEADER

    # Then add the following to your ~/.docker/config.json
    "HttpHeaders": {
        "X-Registry-Auth": "<HEADER string from above>"
    }

    # Now run a private image against swarm:
    docker run --rm -it yourprivateimage:latest

CLI usage example using registry tokens: (Required engine 1.10 with new auth token support)

    REPO=yourrepo/yourimage
    REPO_USER=yourusername
    read -s PASSWORD
    AUTH_URL=https://auth.docker.io/token
    TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
        jq -r ".token")
    HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
    echo HEADER=$HEADER

    # Update the docker config as above, but the token will expire quickly...

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-12-11 18:36:55 -08:00
Victor Vieux 67a4d559db Merge pull request #1449 from jimenez/mesos_user_abnormal_error
Improving error output for bad swarm mesos user
2015-12-07 13:43:34 -08:00
Alexandre Beslic f21efa4337 Increase default TTL and heartbeat value
Increases the default ttl and heartbeat value for discovery.
Because the node will still be listed for a long period on
`docker info`, there is now a Status to know if a node is
in the healthy or unhealthy state.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-12-04 17:11:33 -08:00
Victor Vieux de6383c4dd Merge pull request #1448 from jimenez/timeout_default
Changing offers timeout default to prevent other frameworks starvation
2015-11-30 14:35:09 -08:00
Victor Vieux b7ca0e7844 Merge pull request #1450 from jimenez/glog_enable
Enabling glog for mesos
2015-11-30 13:40:06 -08:00
Victor Vieux 24fc1b6909 Merge pull request #1451 from aluzzardi/parallel-affinity-fix
Set labels for pending containers
2015-11-25 15:19:58 -08:00