Skip to content

orchestrator/update: Update spec version when rolling back#2309

Merged
aaronlehmann merged 1 commit intomoby:masterfrom
aaronlehmann:rollback-spec-version
Jul 20, 2017
Merged

orchestrator/update: Update spec version when rolling back#2309
aaronlehmann merged 1 commit intomoby:masterfrom
aaronlehmann:rollback-spec-version

Conversation

@aaronlehmann
Copy link
Copy Markdown
Collaborator

There is an oversight in this code that prevents it from changing the
spec version to match the spec that's put in place during a rollback.

This could cause a service not to get rolled back all the way.
Currently, tasks may stay on the new version until they fail and are
replaced with an older version.

cc @cpuguy83 @thaJeztah

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 14, 2017

Codecov Report

Merging #2309 into master will increase coverage by 0.15%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #2309      +/-   ##
==========================================
+ Coverage   60.11%   60.27%   +0.15%     
==========================================
  Files         128      128              
  Lines       25891    25863      -28     
==========================================
+ Hits        15565    15588      +23     
+ Misses       8947     8894      -53     
- Partials     1379     1381       +2

@cyli
Copy link
Copy Markdown
Contributor

cyli commented Jul 18, 2017

LGTM, with the caveat that I am not super familiar with this code, but it makes sense and the updated test fails without the change.

There is an oversight in this code that prevents it from changing the
spec version to match the spec that's put in place during a rollback.

This could cause a service not to get rolled back all the way.
Currently, tasks may stay on the new version until they fail and are
replaced with an older version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@aaronlehmann aaronlehmann force-pushed the rollback-spec-version branch from f2e0ef6 to 0538dde Compare July 18, 2017 23:36
@aaronlehmann aaronlehmann merged commit 1447e74 into moby:master Jul 20, 2017
@aaronlehmann aaronlehmann deleted the rollback-spec-version branch July 20, 2017 20:45
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
- moby/swarmkit#2288 (Allow updates of failed services with restart policy "none")
- moby/swarmkit#2304 (Reset restart history when task spec changes)
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)
- moby/swarmkit#2323 (run watchapi server on all managers)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Feb 3, 2020
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)
- moby/swarmkit#2323 (run watchapi server on all managers)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Feb 3, 2020
- moby/swarmkit#2288 (Allow updates of failed services with restart policy "none")
- moby/swarmkit#2304 (Reset restart history when task spec changes)
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 10, 2020
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)
- moby/swarmkit#2323 (run watchapi server on all managers)

Signed-off-by: Ying <ying.li@docker.com>
glours pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 11, 2020
- moby/swarmkit#2288 (Allow updates of failed services with restart policy "none")
- moby/swarmkit#2304 (Reset restart history when task spec changes)
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 17, 2020
- moby/swarmkit#2288 (Allow updates of failed services with restart policy "none")
- moby/swarmkit#2304 (Reset restart history when task spec changes)
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 23, 2020
- moby/swarmkit#2288 (Allow updates of failed services with restart policy "none")
- moby/swarmkit#2304 (Reset restart history when task spec changes)
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)

Signed-off-by: Ying <ying.li@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 23, 2020
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)
- moby/swarmkit#2323 (run watchapi server on all managers)

Signed-off-by: Ying <ying.li@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants