Commit Graph

2430 Commits

Author SHA1 Message Date
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
Alexandre Beslic
ba5cbb9519 Merge pull request #1590 from jimenez/upgrade_mesos0.25
Upgrade mesos0.25 in CI
2016-01-07 13:55:34 -08:00
Victor Vieux
017a26175b Merge pull request #1592 from jimenez/stress_test
Stress test for mesos
2016-01-07 13:37:07 -08:00
Isabel Jimenez
3f5d018c2d moving big run to more adequate stress test
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-06 22:57:16 -05:00
Isabel Jimenez
2ec3c16efe adapting tests to mesos0.25 upgrade
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-06 21:12:53 -05: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
Isabel Jimenez
542af05391 updrading tests to use mesos 0.25
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-06 20:18:07 -05: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
Xian Chaobo
ef8fb1cbc8 Merge pull request #1579 from vieux/fix_api_code
fix status code when container found on unhealthy node
2016-01-06 09:30:25 +08:00
Dongluo Chen
82df09b537 Merge pull request #1586 from vieux/fix_soft_affinity_reschedule
fix soft affinity reschedule
2016-01-05 17:27:31 -08:00
Dong Chen
6a1b49cf4e Fix format issue in state.bats.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-05 16:20:38 -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
Alexandre Beslic
b2739245ce Merge pull request #1581 from vieux/fix_case_test
fix plugin not found case in tests
2016-01-04 22:27:06 -08:00
Victor Vieux
94aad7d423 fix plugin not found case in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 22:06:12 -08:00
Victor Vieux
0f93c86398 fix test ps --before
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 17:36:51 -08:00
Victor Vieux
cc7acf92e7 fix status code when container found on unhealthy node
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 17:24:10 -08:00
Dongluo Chen
2982243db6 Merge pull request #1375 from vieux/fix_soft
fix soft affinities/constraints
2016-01-04 16:35:30 -08:00
Victor Vieux
ea5b2290ed fix soft affinities/constraints
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 15:59:51 -08:00
Alexandre Beslic
40f26856a5 Merge pull request #1410 from dongluochen/joinSpike
Add a random delay to avoid synchronized registration at swarm join. Simple fix for #1353
2016-01-04 12:28:17 -08:00
Victor Vieux
31534f6519 Merge pull request #1577 from dongluochen/clientUpdate
Godep dockerclient update.
2016-01-04 11:51:21 -08:00
Dong Chen
4e7e23819b Godep dockerclient update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-04 11:26:53 -08:00
Alexandre Beslic
8c5b47b527 Merge pull request #1558 from vieux/update_docker_godeps
cleanup godeps
2016-01-04 11:13:38 -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
Alexandre Beslic
2aff182135 Merge pull request #1566 from lowstz/fix-doc-typo
Fix leadership doc example typo
2015-12-29 11:59:42 -08:00
Aaron Chen
5728b670ae Fix Fault Tolerance section code example without ttl
Signed-off-by: Aaron Chen <aaron.chen@curiositychina.com>
2015-12-30 03:08:09 +08:00
Aaron Chen
3cf44b5b24 Fix leadership doc example typo
Signed-off-by: Aaron Chen <aaron.chen@curiositychina.com>
2015-12-29 19:11:35 +08:00
Victor Vieux
15a91b1c73 Merge pull request #1564 from vieux/fix_stable_tests
fix stable tests
2015-12-22 15:21:39 -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
Victor Vieux
c11d4fe82c fix stable tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-22 00:03:59 -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
Alexandre Beslic
7b1fee929a Merge pull request #1555 from vieux/removes
remove sleep from tests
2015-12-17 17:53:12 -08:00
Dongluo Chen
c60ec6fd23 Merge pull request #1520 from dongluochen/DocUpdateResource
Update document on resource occupation.
2015-12-17 17:22:33 -08:00
Victor Vieux
d00c23094b remove sleep from tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-17 16:49:54 -08:00
Victor Vieux
53cf899e31 Merge pull request #1517 from dongluochen/EngineFastFailure
Use failureCount as a secondary health indicator.
2015-12-17 16:35:29 -08:00
Victor Vieux
5050e79f83 Merge pull request #1552 from abronan/fix_lock_ttl_store_failure
Fix Consul Lock TTL with store failure
2015-12-17 13:27:42 -08:00
Alexandre Beslic
2a9e162556 Merge pull request #1553 from fsoppelsa/readme-contributelinks
Readme contributelinks
2015-12-17 10:13:55 -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
Fabrizio Soppelsa
2cfa251165 Add the Swarm contribute link and correct a "here" without link
Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
2015-12-17 00:01:28 -08:00
Alexandre Beslic
5e8998eb6d Fix Consul Lock TTL with store failure
If using the Lock TTL feature with Consul, the code
path in libkv is issuing a Put in the background through
the PeriodicRenewal call. The error is then eaten up and
ignored on the candidate loop. This would lead to the
candidate and followers being stuck in their candidate
loop. Consequence would be that they would not retry to
take the lock ending in a state with no Leader.

This patch restores an explicit error check instead of
wrongfully passing on the error to the channel before
giving it back to the caller.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-12-16 15:46:11 -08:00